From ea5c7b8a4200a6d32cb9d868e19285df05515624 Mon Sep 17 00:00:00 2001
From: Robert Collins <robertc@robertcollins.net>
Date: Sun, 27 Jan 2013 13:55:33 +1300
Subject: Tweak Python3 support to help testrepository get 3-ready.

---
 python/subunit/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'python')

diff --git a/python/subunit/__init__.py b/python/subunit/__init__.py
index 42dcf29..dfc5e94 100644
--- a/python/subunit/__init__.py
+++ b/python/subunit/__init__.py
@@ -121,9 +121,9 @@ import re
 import subprocess
 import sys
 import unittest
-if sys.version_info > (3, 0):
+try:
     from io import UnsupportedOperation as _UnsupportedOperation
-else:
+except ImportError:
     _UnsupportedOperation = AttributeError
 
 
@@ -1285,7 +1285,7 @@ def _make_stream_binary(stream):
     """
     try:
         fileno = stream.fileno()
-    except _UnsupportedOperation:
+    except (_UnsupportedOperation, AttributeError):
         pass
     else:
         _make_binary_on_windows(fileno)
-- 
cgit v1.2.1