Merge pull request #101 from ZoeyYoung/jieba3k

Jieba3k

jieba/analyse/__init__.py

@@ -2,7 +2,7 @@ import jieba
 import os
 
 try:
-    from analyzer import ChineseAnalyzer
+    from .analyzer import ChineseAnalyzer
 except ImportError:
     pass
 

jieba/finalseg/__init__.py

@@ -34,7 +34,7 @@ def load_model():
 
     emit_p = {}
     abs_path = os.path.join(_curpath, PROB_EMIT_P)
-    with file(abs_path, 'rb') as f:
+    with open(abs_path, 'rb') as f:
         emit_p = marshal.load(f)
     f.closed
 

jieba/posseg/__init__.py

@@ -41,13 +41,13 @@ def load_model(f_name,isJython=True):
 
     emit_p = {}
     abs_path = os.path.join(_curpath, PROB_EMIT_P)
-    with file(abs_path, 'rb') as f:
+    with open(abs_path, 'rb') as f:
         emit_p = marshal.load(f)
     f.closed
 
     state = {}
     abs_path = os.path.join(_curpath, CHAR_STATE_TAB_P)
-    with file(abs_path, 'rb') as f:
+    with open(abs_path, 'rb') as f:
         state = marshal.load(f)
     f.closed
 

test/test_whoosh.py

@@ -5,7 +5,7 @@ from whoosh.index import create_in,open_dir
 from whoosh.fields import *
 from whoosh.qparser import QueryParser
 
-from jieba.analyse.analyzer import ChineseAnalyzer
+from jieba.analyse import ChineseAnalyzer
 
 analyzer = ChineseAnalyzer()