modernize tests

Author: manu-chroma

schema_salad/tests/test_cli_args.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import sys
 

schema_salad/tests/test_errors.py

@@ -1,9 +1,12 @@
+from __future__ import absolute_import
+from __future__ import print_function
 from .util import get_data
 import unittest
 from typing import cast
 from schema_salad.schema import load_schema, load_and_validate
 from schema_salad.validate import ValidationException
 from avro.schema import Names
+import six
 
 class TestErrors(unittest.TestCase):
     def test_errors(self):
@@ -28,7 +31,7 @@ def test_errors(self):
             with self.assertRaises(ValidationException):
                 try:
                     load_and_validate(document_loader, avsc_names,
-                            unicode(get_data("tests/"+t)), True)
+                            six.text_type(get_data("tests/"+t)), True)
                 except ValidationException as e:
-                    print("\n", e)
+                    print(("\n", e))
                     raise

schema_salad/tests/test_examples.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+from __future__ import print_function
 from .util import get_data
 import unittest
 import schema_salad.ref_resolver
@@ -285,7 +287,7 @@ def test_scoped_id(self):
                           }, ra)
 
         g = makerdf(None, ra, ctx)
-        print(g.serialize(format="n3"))
+        print((g.serialize(format="n3")))
 
         ra, _ = ldr.resolve_all(cmap({
             "location": "foo",
@@ -299,7 +301,7 @@ def test_scoped_id(self):
                           }, ra)
 
         g = makerdf(None, ra, ctx)
-        print(g.serialize(format="n3"))
+        print((g.serialize(format="n3")))
 
         ra, _ = ldr.resolve_all(cmap({
             "id": "foo",
@@ -313,7 +315,7 @@ def test_scoped_id(self):
                           }, ra)
 
         g = makerdf(None, ra, ctx)
-        print(g.serialize(format="n3"))
+        print((g.serialize(format="n3")))
 
         ra, _ = ldr.resolve_all(cmap({
             "location": "foo",
@@ -327,7 +329,7 @@ def test_scoped_id(self):
                           }, ra)
 
         g = makerdf(None, ra, ctx)
-        print(g.serialize(format="n3"))
+        print((g.serialize(format="n3")))
 
     def test_mixin(self):
         base_url = "file://" + os.getcwd() + "/tests/"

schema_salad/tests/test_fetch.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+from __future__ import print_function
 import unittest
 import schema_salad.ref_resolver
 import schema_salad.main
@@ -52,6 +54,6 @@ def test_cache(self):
         loader = schema_salad.ref_resolver.Loader({})
         foo = "file://%s/foo.txt" % os.getcwd()
         loader.cache.update({foo: "hello: foo"})
-        print(loader.cache)
+        print((loader.cache))
         self.assertEqual({"hello": "foo"}, loader.resolve_ref("foo.txt")[0])
         self.assertTrue(loader.check_exists(foo))

schema_salad/tests/test_ref_resolver.py

@@ -1,5 +1,6 @@
 """Test the ref_resolver module."""
 
+from __future__ import absolute_import
 import shutil
 import tempfile
 

schema_salad/tests/util.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from pkg_resources import Requirement, resource_filename, ResolutionError  # type: ignore
 from typing import Optional, Text
 import os