X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=blobdiff_plain;f=htsworkflow%2Futil%2Ftest%2Ftest_alphanum.py;h=e6ad5bd644784f87520d2c2b0d061146cb1e08df;hp=29a53859a6bcb70699f0e028039759c15882540d;hb=refs%2Fheads%2Fpython3-django1.5;hpb=4262586d10cc0cc227390873b301b55244204c11

diff --git a/htsworkflow/util/test/test_alphanum.py b/htsworkflow/util/test/test_alphanum.py
index 29a5385..e6ad5bd 100644
--- a/htsworkflow/util/test/test_alphanum.py
+++ b/htsworkflow/util/test/test_alphanum.py
@@ -1,6 +1,6 @@
 import copy
 import os
-from unittest2 import TestCase
+from unittest import TestCase
 
 from htsworkflow.util.alphanum import alphanum
 
@@ -11,9 +11,9 @@ class testAlphanum(TestCase):
       scratch = copy.copy(unsorted)
       scratch.sort(alphanum)
 
-      for i in xrange(len(scratch)):
+      for i in range(len(scratch)):
         self.failIfEqual(scratch[i], unsorted[i])
-      for i in xrange(len(scratch)):
+      for i in range(len(scratch)):
         self.failUnlessEqual(scratch[i], sorted[i])
 
     def test_numbers(self):
@@ -22,9 +22,9 @@ class testAlphanum(TestCase):
       scratch = copy.copy(unsorted)
       scratch.sort(alphanum)
 
-      for i in xrange(len(scratch)):
+      for i in range(len(scratch)):
         self.failIfEqual(scratch[i], unsorted[i])
-      for i in xrange(len(scratch)):
+      for i in range(len(scratch)):
         self.failUnlessEqual(scratch[i], sorted[i])
 
     def test_long_names(self):
@@ -42,12 +42,12 @@ class testAlphanum(TestCase):
 
 
 def suite():
-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(testAlphanum))
     return suite
 
 
 if __name__ == "__main__":
-    from unittest2 import main
+    from unittest import main
     main(defaultTest="suite")