Minor fixes

Author: YNedderhoff

modules/featmap.py

@@ -13,44 +13,44 @@ def give_features(hform, hlemma, hpos, dform, dlemma, dpos, bpos):
     # 6 = hlemma
     # 7 = dlemma
 
-    yield "1:{0}".format(hform)
-    yield "2:{0}".format(hpos)
-    yield "3:{0}".format(dform)
-    yield "4:{0}".format(dpos)
-    yield "6:{0}".format(hlemma)
-    yield "7:{0}".format(dlemma)
-    yield "5:{0}".format(bpos)
+    yield u'1:{0}'.format(hform)
+    yield u'2:{0}'.format(hpos)
+    yield u'3:{0}'.format(dform)
+    yield u'4:{0}'.format(dpos)
+    yield u'6:{0}'.format(hlemma)
+    yield u'7:{0}'.format(dlemma)
+    yield u'5:{0}'.format(bpos)
 
-    yield "1,4:{0},{1}".format(hform, dpos)
-    yield "2,3:{0},{1}".format(hpos, dform)
-    yield "1,2:{0},{1}".format(hform, hpos)
-    yield "3,4:{0},{1}".format(dform, dpos)
-    yield "1,3:{0},{1}".format(hform, dform)
-    yield "2,4:{0},{1}".format(hpos, dpos)
-    yield "6,4:{0},{1}".format(hlemma, dpos)
-    yield "2,7:{0},{1}".format(hpos, dlemma)
-    yield "6,2:{0},{1}".format(hlemma, hpos)
-    yield "7,4:{0},{1}".format(dlemma, dpos)
-    yield "6,7:{0},{1}".format(hlemma, dlemma)
+    yield u'1,4:{0},{1}'.format(hform, dpos)
+    yield u'2,3:{0},{1}'.format(hpos, dform)
+    yield u'1,2:{0},{1}'.format(hform, hpos)
+    yield u'3,4:{0},{1}'.format(dform, dpos)
+    yield u'1,3:{0},{1}'.format(hform, dform)
+    yield u'2,4:{0},{1}'.format(hpos, dpos)
+    yield u'6,4:{0},{1}'.format(hlemma, dpos)
+    yield u'2,7:{0},{1}'.format(hpos, dlemma)
+    yield u'6,2:{0},{1}'.format(hlemma, hpos)
+    yield u'7,4:{0},{1}'.format(dlemma, dpos)
+    yield u'6,7:{0},{1}'.format(hlemma, dlemma)
 
-    yield "1,2,3,4:{0},{1},{2},{3}".format(hform, hpos, dform, dpos)
-    yield "2,3,4:{0},{1},{2}".format(hpos, dform, dpos)
-    yield "1,3,4:{0},{1},{2}".format(hform, dform, dpos)
-    yield "1,2,3:{0},{1},{2}".format(hform, hpos, dform)
-    yield "1,2,4:{0},{1},{2}".format(hform, hpos, dpos)
-    yield "2,5,4:{0},{1},{2}".format(hpos, bpos, dpos)
-    yield "2,5,3:{0},{1},{2}".format(hpos, bpos, dform)
-    yield "1,5,4:{0},{1},{2}".format(hform, bpos, dpos)
-    yield "1,5,3:{0},{1},{2}".format(hform, bpos, dform)
+    yield u'1,2,3,4:{0},{1},{2},{3}'.format(hform, hpos, dform, dpos)
+    yield u'2,3,4:{0},{1},{2}'.format(hpos, dform, dpos)
+    yield u'1,3,4:{0},{1},{2}'.format(hform, dform, dpos)
+    yield u'1,2,3:{0},{1},{2}'.format(hform, hpos, dform)
+    yield u'1,2,4:{0},{1},{2}'.format(hform, hpos, dpos)
+    yield u'2,5,4:{0},{1},{2}'.format(hpos, bpos, dpos)
+    yield u'2,5,3:{0},{1},{2}'.format(hpos, bpos, dform)
+    yield u'1,5,4:{0},{1},{2}'.format(hform, bpos, dpos)
+    yield u'1,5,3:{0},{1},{2}'.format(hform, bpos, dform)
 
-    yield "6,2,7,4:{0},{1},{2},{3}".format(hlemma, hpos, dlemma, dpos)
-    yield "2,7,4:{0},{1},{2}".format(hpos, dlemma, dpos)
-    yield "6,7,4:{0},{1},{2}".format(hlemma, dlemma, dpos)
-    yield "6,2,7:{0},{1},{2}".format(hlemma, hpos, dlemma)
-    yield "6,2,4:{0},{1},{2}".format(hlemma, hpos, dpos)
-    yield "2,5,7:{0},{1},{2}".format(hpos, bpos, dlemma)
-    yield "6,5,4:{0},{1},{2}".format(hlemma, bpos, dpos)
-    yield "6,5,7:{0},{1},{2}".format(hlemma, bpos, dlemma)
+    yield u'6,2,7,4:{0},{1},{2},{3}'.format(hlemma, hpos, dlemma, dpos)
+    yield u'2,7,4:{0},{1},{2}'.format(hpos, dlemma, dpos)
+    yield u'6,7,4:{0},{1},{2}'.format(hlemma, dlemma, dpos)
+    yield u'6,2,7:{0},{1},{2}'.format(hlemma, hpos, dlemma)
+    yield u'6,2,4:{0},{1},{2}'.format(hlemma, hpos, dpos)
+    yield u'2,5,7:{0},{1},{2}'.format(hpos, bpos, dlemma)
+    yield u'6,5,4:{0},{1},{2}'.format(hlemma, bpos, dpos)
+    yield u'6,5,7:{0},{1},{2}'.format(hlemma, bpos, dlemma)
 
 
 def fm(infile):

modules/graphs.py

@@ -215,7 +215,7 @@ def write_graph_to_file(graph, out_file, mode="normal"):  # write a graph to fil
         with codecs.open(out_file, "a", "utf-8") as out:
             for dependent in sorted(rev):
                 # without rel
-                print >> out, "{0}\t{1}\t{2}\t{3}\t_\t_\t{4}\t_\t_\t_".format(
+                print >> out, u"{0}\t{1}\t{2}\t{3}\t_\t_\t{4}\t_\t_\t_".format(
                     rev[dependent][0].dependent,
                     rev[dependent][0].dependent_form,
                     rev[dependent][0].dependent_lemma,
@@ -228,7 +228,7 @@ def write_graph_to_file(graph, out_file, mode="normal"):  # write a graph to fil
         rev = reverse_head_graph(graph)
         with codecs.open(out_file, "a", "utf-8") as out:
             for dependent in sorted(rev):
-                print >> out, "{0}\t{1}\t{2}\t{3}\t_\t_\t-1\t_\t_\t_".format(
+                print >> out, u"{0}\t{1}\t{2}\t{3}\t_\t_\t-1\t_\t_\t_".format(
                     rev[dependent][0].dependent,
                     rev[dependent][0].dependent_form,
                     rev[dependent][0].dependent_lemma,