tweaked a few python 2/3 syntaxes

text-machine-lab · Feb 23, 2018 · fe832e9 · fe832e9
1 parent 6e20c7d
commit fe832e9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/code/feature_extraction/word_features.py b/code/feature_extraction/word_features.py
@@ -39,7 +39,7 @@ def feature_length(word):
 def feature_stem_porter(word):
     try:
         return {('stem_porter', porter_st.stem(word)): 1}
-    except Exception, e:
+    except Exception as e:
         return {}
 
 def feature_mitre(word):

diff --git a/code/model.py b/code/model.py
@@ -18,20 +18,10 @@
 
 from notes.documents import labels as tag2id, id2tag
 from tools           import flatten, save_list_structure, reconstruct_list
-from tools           import print_str, print_vec, print_files
+from tools           import print_str, print_vec, print_files, write
 
 
 
-# python2 needs to convert to unicdode, but thats default for python3
-if sys.version_info.major == 2:
-    tostr = unicode
-else:
-    tostr = str
-
-def write(f, s):
-    f.write(tostr(s))
-
-
 
 class ClinerModel:
 

diff --git a/code/tools.py b/code/tools.py
@@ -8,6 +8,7 @@
 
 
 import os
+import sys
 import errno
 import string
 import math
@@ -232,6 +233,17 @@ def print_files(f, file_names):
 
 
 
+# python2 needs to convert to unicdode, but thats default for python3
+if sys.version_info.major == 2:
+    tostr = unicode
+else:
+    tostr = str
+
+def write(f, s):
+    f.write(tostr(s))
+
+
+
 def print_vec(f, label, vec):
     '''
     print_vec()

diff --git a/requirements.txt b/requirements.txt
@@ -3,5 +3,3 @@ python-crfsuite
 numpy
 scipy
 scikit-learn
-marisa-trie
-repoze.lru