Initial port to python3

[htsworkflow.git] / htsworkflow / submission / test / test_submission.py

diff --git a/htsworkflow/submission/test/test_submission.py b/htsworkflow/submission/test/test_submission.py
index 90852ceb766f56a871fc199d675982fc095b98c2..699254cdc0521d5f80ba65d283e23133a57f1c2c 100644 (file)
--- a/htsworkflow/submission/test/test_submission.py
+++ b/htsworkflow/submission/test/test_submission.py
@@ -1,8 +1,8 @@
 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 \
@@ -18,7 +18,7 @@ from htsworkflow.util.rdfhelp import \
      get_serializer
 from htsworkflow.submission.submission import list_submissions, Submission
 from htsworkflow.submission.results import ResultMap
-from submission_test_common import *
+from .submission_test_common import *
 
 import RDF
 #import logging
@@ -122,8 +122,8 @@ thisView:alignments ucscDaf:filename_re ".*\\.bam$" ;
 
         """
         map = ResultMap()
-        print self.tempdir
-        print os.listdir(self.tempdir)
+        print(self.tempdir)
+        print(os.listdir(self.tempdir))
         map['1000'] = os.path.join(self.tempdir, S1_NAME)
         map['2000'] = os.path.join(self.tempdir, S2_NAME)
 
@@ -189,5 +189,5 @@ def suite():
     return suite
 
 if __name__ == "__main__":
-    from unittest2 import main
+    from unittest import main
     main(defaultTest='suite')