FIX python 2 vector

pattern3 · Dec 11, 2014 · 466f210 · 466f210
1 parent 0c5f92d
commit 466f210
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/pattern/db/__init__.py b/pattern/db/__init__.py
@@ -2134,7 +2134,7 @@ def csv_header_encode(field, type=STRING):
     # csv_header_encode("age", INTEGER) => "age (INTEGER)".
     t = re.sub(r"^varchar\(.*?\)", "string", (type or ""))
     t = t and " (%s)" % t or ""
-    s = "%s%s" % (encode_utf8(field or ""), t.upper())
+    s = "%s%s" % (field or "", t.upper())
     return s
 
 

diff --git a/pattern/vector/__init__.py b/pattern/vector/__init__.py
@@ -780,7 +780,7 @@ def _repr(self):
                     self.type and ", type=%s" % repr(self.type) or "")
 
     def __repr__(self):
-        return "Document(id=%s%s%s)" % self._repr()
+        return "Document(id=%s)" % self._repr()
 
     def __hash__(self):
         return hash(self._repr())

diff --git a/test/test_vector.py b/test/test_vector.py
@@ -464,7 +464,8 @@ def test_frequent_concept_sets(self):
         # Assert Apriori algorithm.
         v = self.model.frequent(threshold=0.5)
         self.assertEqual(
-            sorted(v.keys()), [frozenset(["cats"]), frozenset(["dogs"])])
+                sorted(v.keys(), key=lambda x: str(x)),
+                [frozenset(["cats"]), frozenset(["dogs"])])
         print("pattern.vector.Model.frequent()")
 
     def test_cosine_similarity(self):