o2w/talon
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added exception checking for pickle format conversion

Browse Source
This commit is contained in:
Yacine Filali
2017-05-24 10:26:33 -07:00
parent 15e61768f2
commit 4364bebf38
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
talon/signature/bruteforce.py
View File

@@ -110,7 +110,7 @@ def extract_signature(msg_body):
return (stripped_body.strip(), return (stripped_body.strip(),
signature.strip()) signature.strip())
except Exception as e: except Exception:
log.exception('ERROR extracting signature') log.exception('ERROR extracting signature')
return (msg_body, None) return (msg_body, None)

7
talon/signature/learning/classifier.py
View File

@@ -35,11 +35,16 @@ def load(saved_classifier_filename, train_data_filename):
try: try:
return joblib.load(saved_classifier_filename) return joblib.load(saved_classifier_filename)
except ValueError: except ValueError:
# load python 2 pickle format with python 3, and save it permissions allowing
import sys import sys
kwargs = {} kwargs = {}
if sys.version_info > (3, 0): if sys.version_info > (3, 0):
kwargs["encoding"] = "latin1" kwargs["encoding"] = "latin1"
loaded = pickle.load(open(saved_classifier_filename, 'rb'), **kwargs) loaded = pickle.load(open(saved_classifier_filename, 'rb'), **kwargs)
joblib.dump(loaded, saved_classifier_filename, compress=True) try:
joblib.dump(loaded, saved_classifier_filename, compress=True)
except Exception:
pass
return joblib.load(saved_classifier_filename) return joblib.load(saved_classifier_filename)