X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=blobdiff_plain;f=htsworkflow%2Fsubmission%2Ftest%2Ftest_submission.py;fp=htsworkflow%2Fsubmission%2Ftest%2Ftest_submission.py;h=699254cdc0521d5f80ba65d283e23133a57f1c2c;hp=90852ceb766f56a871fc199d675982fc095b98c2;hb=53ebb47e86e81ce349d4ef4e16aef94be93486ea;hpb=4262586d10cc0cc227390873b301b55244204c11 diff --git a/htsworkflow/submission/test/test_submission.py b/htsworkflow/submission/test/test_submission.py index 90852ce..699254c 100644 --- 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')