Change unittest2 back into unittest.

[htsworkflow.git] / htsworkflow / util / test / test_rdfhelp.py

diff --git a/htsworkflow/util/test/test_rdfhelp.py b/htsworkflow/util/test/test_rdfhelp.py
index 3f328d8d18b43b8ec5bd80fb5f2f4a70501b67a8..9694c37e244658b274735603c8723fc9986f3e32 100644 (file)
--- 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
 
@@ -19,7 +19,7 @@ from htsworkflow.util.rdfhelp import \
      rdfsNS, \
      remove_schemas, \
      toTypedNode, \
-     stripNamespace, \
+     strip_namespace, \
      simplify_uri, \
      sanitize_literal, \
      xsdNS
@@ -121,17 +121,17 @@ try:
 
             term = 'foo'
             node = nsOrg[term]
-            self.assertEqual(stripNamespace(nsOrg, node), term)
-            self.assertEqual(stripNamespace(nsCom, node), None)
-            self.assertEqual(stripNamespace(nsOrg, node.uri), term)
+            self.assertEqual(strip_namespace(nsOrg, node), term)
+            self.assertEqual(strip_namespace(nsCom, node), None)
+            self.assertEqual(strip_namespace(nsOrg, node.uri), term)
 
         def test_strip_namespace_exceptions(self):
             nsOrg = RDF.NS('example.org/example#')
             nsCom = RDF.NS('example.com/example#')
 
             node = toTypedNode('bad')
-            self.assertRaises(ValueError, stripNamespace, nsOrg, node)
-            self.assertRaises(ValueError, stripNamespace, nsOrg, nsOrg)
+            self.assertRaises(ValueError, strip_namespace, nsOrg, node)
+            self.assertRaises(ValueError, strip_namespace, nsOrg, nsOrg)
 
         def test_simplify_uri(self):
             DATA = [('http://asdf.org/foo/bar', 'bar'),
@@ -265,7 +265,7 @@ except ImportError, 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")