Initial port to python3

[htsworkflow.git] / htsworkflow / frontend / inventory / test_inventory.py

diff --git a/htsworkflow/frontend/inventory/test_inventory.py b/htsworkflow/frontend/inventory/test_inventory.py
index 86d37b7cbe7e740468f04df9380ae8fa82c98b35..a66ebce77cf0354f6571a304aa30f3d4db39db53 100644 (file)
--- a/htsworkflow/frontend/inventory/test_inventory.py
+++ b/htsworkflow/frontend/inventory/test_inventory.py
@@ -38,7 +38,7 @@ class InventoryTestCase(TestCase):
 
         itemNode = RDF.Node(RDF.Uri(url))
         item_type = fromTypedNode(model.get_target(itemNode, inventoryOntology['item_type']))
-        self.failUnlessEqual(item_type, u'Hard Drive')
+        self.failUnlessEqual(item_type, 'Hard Drive')
 
     def test_itemindex(self):
         url = '/inventory/it/Hard Drive/'
@@ -123,11 +123,11 @@ def tearDownModule():
     teardown_test_environment()
 
 def suite():
-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(InventoryTestCase))
     return suite
 
 if __name__ == "__main__":
-    from unittest2 import main
+    from unittest import main
     main(defaultTest="suite")