X-Git-Url: http://woldlab.caltech.edu/gitweb/?a=blobdiff_plain;f=htsworkflow%2Futil%2Ftest%2Ftest_rdfhelp.py;h=bbf380aaf11c8304e5c87007b1f8e837dccf585a;hb=53ebb47e86e81ce349d4ef4e16aef94be93486ea;hp=3f328d8d18b43b8ec5bd80fb5f2f4a70501b67a8;hpb=4262586d10cc0cc227390873b301b55244204c11;p=htsworkflow.git

diff --git a/htsworkflow/util/test/test_rdfhelp.py b/htsworkflow/util/test/test_rdfhelp.py
index 3f328d8..bbf380a 100644
--- a/htsworkflow/util/test/test_rdfhelp.py
+++ b/htsworkflow/util/test/test_rdfhelp.py
@@ -1,6 +1,6 @@
 import os
 import types
-from unittest2 import TestCase
+from unittest import TestCase
 
 from datetime import datetime
 
@@ -33,7 +33,7 @@ try:
 
         def test_typed_node_boolean(self):
             node = toTypedNode(True)
-            self.assertIn(node.literal_value['string'], (u'1', u'true'))
+            self.assertIn(node.literal_value['string'], ('1', 'true'))
             self.assertEqual(str(node.literal_value['datatype']),
                                  'http://www.w3.org/2001/XMLSchema#boolean')
 
@@ -49,7 +49,7 @@ try:
 
         def test_typed_node_string(self):
             node = toTypedNode('hello')
-            self.assertEqual(node.literal_value['string'], u'hello')
+            self.assertEqual(node.literal_value['string'], 'hello')
             self.assertTrue(node.literal_value['datatype'] is None)
 
         def test_typed_real_like(self):
@@ -67,7 +67,7 @@ try:
             s = "Argh matey"
             node = toTypedNode(s)
             self.assertEqual(fromTypedNode(node), s)
-            self.assertEqual(type(fromTypedNode(node)), types.UnicodeType)
+            self.assertEqual(type(fromTypedNode(node)), str)
 
         def test_blank_or_uri_blank(self):
             node = blankOrUri()
@@ -86,10 +86,10 @@ try:
             self.assertEqual(node, s)
 
         def test_unicode_node_roundtrip(self):
-            literal = u'\u5927'
+            literal = '\u5927'
             roundtrip = fromTypedNode(toTypedNode(literal))
             self.assertEqual(roundtrip, literal)
-            self.assertEqual(type(roundtrip), types.UnicodeType)
+            self.assertEqual(type(roundtrip), str)
 
         def test_datetime_no_microsecond(self):
             dateTimeType = xsdNS['dateTime'].uri
@@ -261,11 +261,11 @@ _:a owl:imports "{loc}extra.turtle" .
             self.assertTrue(model.contains_statement(s))
 
 
-except ImportError, e:
-    print "Unable to test rdfhelp"
+except ImportError as e:
+    print("Unable to test rdfhelp")
 
 def suite():
-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestRDFHelp))
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestRDFSchemas))
@@ -273,5 +273,5 @@ def suite():
 
 
 if __name__ == "__main__":
-    from unittest2 import main
+    from unittest import main
     main(defaultTest="suite")