From 835e68c585519553db264c342615643fd0604618 Mon Sep 17 00:00:00 2001 From: Sun Junyi Date: Wed, 21 Aug 2013 16:01:49 +0800 Subject: [PATCH] fix bug of merge pull request --- jieba/finalseg/__init__.py | 2 +- jieba/posseg/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jieba/finalseg/__init__.py b/jieba/finalseg/__init__.py index 7c70d00..831d8c2 100644 --- a/jieba/finalseg/__init__.py +++ b/jieba/finalseg/__init__.py @@ -43,7 +43,7 @@ def load_model(): if sys.platform.startswith("java"): start_P, trans_P, emit_P = load_model() else: - import prob_start,prob_trans,prob_emit + from . import prob_start,prob_trans,prob_emit start_P, trans_P, emit_P = prob_start.P, prob_trans.P, prob_emit.P def viterbi(obs, states, start_p, trans_p, emit_p): diff --git a/jieba/posseg/__init__.py b/jieba/posseg/__init__.py index 16a5e7d..19c0074 100644 --- a/jieba/posseg/__init__.py +++ b/jieba/posseg/__init__.py @@ -16,7 +16,7 @@ def load_model(f_name,isJython=True): _curpath=os.path.normpath( os.path.join( os.getcwd(), os.path.dirname(__file__) ) ) result = {} - with file(f_name, "rb") as f: + with open(f_name, "rb") as f: for line in open(f_name,"rb"): line = line.strip() if line=="":continue @@ -56,7 +56,7 @@ def load_model(f_name,isJython=True): if sys.platform.startswith("java"): char_state_tab_P, start_P, trans_P, emit_P, word_tag_tab = load_model(jieba.get_abs_path_dict()) else: - import char_state_tab, prob_start, prob_trans, prob_emit + from . import char_state_tab, prob_start, prob_trans, prob_emit char_state_tab_P, start_P, trans_P, emit_P = char_state_tab.P, prob_start.P, prob_trans.P, prob_emit.P word_tag_tab = load_model(jieba.get_abs_path_dict(),isJython=False)