bugfix: python2.7 unit test fix.

toumorokoshi · Feb 11, 2017 · e5eaff5 · e5eaff5
1 parent 043a6b9
commit e5eaff5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/tests/test_packages_full.py b/tests/test_packages_full.py
@@ -42,6 +42,8 @@ def test_package_cache(tmpdir):
         "uranium_standalone", "--uranium-dir", URANIUM_SOURCE_ROOT,
         cwd=tmpdir.strpath
     )
+    print(out)
+    print(err)
     assert "Requirement already satisified" not in str(out)
     assert code == 0
 

diff --git a/uranium/history.py b/uranium/history.py
@@ -1,6 +1,7 @@
 import json
 import os
 from .lib.utils import ensure_file
+from .lib.compat import str_type
 from .exceptions import HistoryException
 
 
@@ -34,11 +35,11 @@ def load(self):
 def assert_is_serializable(obj):
     if isinstance(obj, dict):
         for k, v in obj.items():
-            if not isinstance(k, str):
-                raise HistoryException("unable to serialize dictionary with not-string key {0}".format(str(k)))
+            if not isinstance(k, str_type):
+                raise HistoryException("unable to serialize dictionary with non-string key {0}".format(str(k)))
             assert_is_serializable(v)
     elif isinstance(obj, list):
         for o in obj:
             assert_is_serializable(o)
-    elif not isinstance(obj, (str, int, float, bool)):
+    elif not isinstance(obj, (str_type, int, float, bool)):
         raise HistoryException("unable to serialize type {0}".format(type(obj)))