testtools-dev team mailing list archive

["Martin \[gz\]" <gzlist@xxxxxxxxxxxxxx>]

Martin [gz] has proposed merging lp:~gz/testtools/trivial_python_3_stringio into lp:testtools.

Requested reviews:
  testtools developers (testtools-dev)


Simple change to make the new test module test_run use StringIO from Python 3 correctly.
-- 
https://code.launchpad.net/~gz/testtools/trivial_python_3_stringio/+merge/43405
Your team testtools developers is requested to review the proposed merge of lp:~gz/testtools/trivial_python_3_stringio into lp:testtools.

=== modified file 'testtools/tests/test_run.py'
--- testtools/tests/test_run.py	2010-11-29 23:46:10 +0000
+++ testtools/tests/test_run.py	2010-12-10 23:41:53 +0000
@@ -2,10 +2,9 @@
 
 """Tests for the test runner logic."""
 
-import StringIO
-
-from testtools.helpers import try_import
+from testtools.helpers import try_import, try_imports
 fixtures = try_import('fixtures')
+StringIO = try_imports(['StringIO.StringIO', 'io.StringIO'])
 
 import testtools
 from testtools import TestCase, run
@@ -43,7 +42,7 @@
         if fixtures is None:
             self.skipTest("Need fixtures")
         package = self.useFixture(SampleTestFixture())
-        out = StringIO.StringIO()
+        out = StringIO()
         run.main(['prog', '-l', 'testtools.runexample.test_suite'], out)
         self.assertEqual("""testtools.runexample.TestFoo.test_bar
 testtools.runexample.TestFoo.test_quux