X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=blobdiff_plain;f=htsworkflow%2Fsubmission%2Ftest%2Ftest_daf.py;h=3e960265f93fac6872382dd06aff1f0117ed175b;hp=7959d1e13d9a323281885d63454790f34f85c48f;hb=refs%2Fheads%2Fpython3-django1.5;hpb=4262586d10cc0cc227390873b301b55244204c11

diff --git a/htsworkflow/submission/test/test_daf.py b/htsworkflow/submission/test/test_daf.py
index 7959d1e..3e96026 100644
--- a/htsworkflow/submission/test/test_daf.py
+++ b/htsworkflow/submission/test/test_daf.py
@@ -1,9 +1,9 @@
 from contextlib import contextmanager
 import os
-from StringIO import StringIO
+from io import StringIO
 import shutil
 import tempfile
-from unittest2 import TestCase, TestSuite, defaultTestLoader
+from unittest import TestCase, TestSuite, defaultTestLoader
 
 from htsworkflow.submission import daf, results
 from htsworkflow.util.rdfhelp import \
@@ -121,7 +121,7 @@ class TestDAF(TestCase):
                 signal_view_node, None, None)))
         self.failUnlessEqual(len(statements), 6)
         name = model.get_target(signal_view_node, dafTermOntology['name'])
-        self.failUnlessEqual(fromTypedNode(name), u'Signal')
+        self.failUnlessEqual(fromTypedNode(name), 'Signal')
 
     def test_get_view_namespace_from_string(self):
         url = "http://jumpgate.caltech.edu/wiki/SubmissionLog/cursub/"
@@ -162,7 +162,7 @@ def load_daf_mapper(name, extra_statements=None, ns=None, test_daf=test_daf):
 def dump_model(model):
     writer = get_serializer()
     turtle =  writer.serialize_model_to_string(model)
-    print turtle
+    print(turtle)
 
 
 class TestUCSCSubmission(TestCase):
@@ -335,5 +335,5 @@ def suite():
     return suite
 
 if __name__ == "__main__":
-    from unittest2 import main
+    from unittest import main
     main(defaultTest='suite')