5 files changed, 25 insertions, 19 deletions
diff --git a/python/subunit/iso8601.py b/python/subunit/iso8601.py
index cbe9a3b..07855d0 100644
--- a/python/subunit/iso8601.py
+++ b/python/subunit/iso8601.py
@@ -127,7 +127,7 @@ def parse_date(datestring, default_timezone=UTC):
     if groups["fraction"] is None:
         groups["fraction"] = 0
     else:
-        groups["fraction"] = int(float("0.%s" % groups["fraction"]) * 1e6)
+        groups["fraction"] = int(float("0.%s" % groups["fraction"].decode()) * 1e6)
     return datetime(int(groups["year"]), int(groups["month"]), int(groups["day"]),
         int(groups["hour"]), int(groups["minute"]), int(groups["second"]),
         int(groups["fraction"]), tz)
diff --git a/python/subunit/tests/sample-script.py b/python/subunit/tests/sample-script.py
index 618e495..91838f6 100755
--- a/python/subunit/tests/sample-script.py
+++ b/python/subunit/tests/sample-script.py
@@ -7,15 +7,15 @@ if len(sys.argv) == 2:
     # subunit.tests.test_test_protocol.TestExecTestCase.test_sample_method_args 
     # uses this code path to be sure that the arguments were passed to
     # sample-script.py
-    print "test fail"
-    print "error fail"
+    print("test fail")
+    print("error fail")
     sys.exit(0)
-print "test old mcdonald"
-print "success old mcdonald"
-print "test bing crosby"
-print "failure bing crosby ["
-print "foo.c:53:ERROR invalid state"
-print "]"
-print "test an error"
-print "error an error"
+print("test old mcdonald")
+print("success old mcdonald")
+print("test bing crosby")
+print("failure bing crosby [")
+print("foo.c:53:ERROR invalid state")
+print("]")
+print("test an error")
+print("error an error")
 sys.exit(0)
diff --git a/python/subunit/tests/sample-two-script.py b/python/subunit/tests/sample-two-script.py
index d555084..fc73dfc 100755
--- a/python/subunit/tests/sample-two-script.py
+++ b/python/subunit/tests/sample-two-script.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import sys
-print "test old mcdonald"
-print "success old mcdonald"
-print "test bing crosby"
-print "success bing crosby"
+print("test old mcdonald")
+print("success old mcdonald")
+print("test bing crosby")
+print("success bing crosby")
 sys.exit(0)
diff --git a/python/subunit/tests/test_run.py b/python/subunit/tests/test_run.py
index 5a96bcf..10519ed 100644
--- a/python/subunit/tests/test_run.py
+++ b/python/subunit/tests/test_run.py
@@ -14,7 +14,7 @@
 #  limitations under that license.
 #
 
-from cStringIO import StringIO
+from testtools.compat import BytesIO
 import unittest
 
 from testtools import PlaceHolder
@@ -42,7 +42,7 @@ class TimeCollectingTestResult(unittest.TestResult):
 class TestSubunitTestRunner(unittest.TestCase):
 
     def test_includes_timing_output(self):
-        io = StringIO()
+        io = BytesIO()
         runner = SubunitTestRunner(stream=io)
         test = PlaceHolder('name')
         runner.run(test)
diff --git a/python/subunit/tests/test_test_results.py b/python/subunit/tests/test_test_results.py
index 3c4f686..236dfa2 100644
--- a/python/subunit/tests/test_test_results.py
+++ b/python/subunit/tests/test_test_results.py
@@ -371,7 +371,10 @@ class TestByTestResultTests(testtools.TestCase):
         super(TestByTestResultTests, self).setUp()
         self.log = []
         self.result = subunit.test_results.TestByTestResult(self.on_test)
-        self.result._now = iter(range(5)).next
+        if sys.version_info >= (3, 0):
+            self.result._now = iter(range(5)).__next__
+        else:
+            self.result._now = iter(range(5)).next
 
     def assertCalled(self, **kwargs):
         defaults = {
@@ -527,7 +530,10 @@ class TestCsvResult(testtools.TestCase):
     def test_csv_output(self):
         stream = StringIO()
         result = subunit.test_results.CsvResult(stream)
-        result._now = iter(range(5)).next
+        if sys.version_info >= (3, 0):
+            result._now = iter(range(5)).__next__
+        else:
+            result._now = iter(range(5)).next
         result.startTestRun()
         result.startTest(self)
         result.addSuccess(self)