summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorRobert Collins <robertc@robertcollins.net>2013-01-27 13:55:33 +1300
committerRobert Collins <robertc@robertcollins.net>2013-01-27 13:55:33 +1300
commitea5c7b8a4200a6d32cb9d868e19285df05515624 (patch)
treef3dd99039154d3c933b2e5a3aad64fd9474b1ce3 /python
parent10df0a2a1f53bf454657362dbb96444f114a0a07 (diff)
downloadsubunit-git-ea5c7b8a4200a6d32cb9d868e19285df05515624.tar.gz
Tweak Python3 support to help testrepository get 3-ready.
Diffstat (limited to 'python')
-rw-r--r--python/subunit/__init__.py6
1 files changed, 3 insertions, 3 deletions
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)