summaryrefslogtreecommitdiff
path: root/Lib/test/test_timeout.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-10-28 08:08:09 +0100
committerGeorg Brandl <georg@python.org>2013-10-28 08:08:09 +0100
commit03b9c293da396efd6df7fb0d980db0faa8bb4b49 (patch)
tree9d1da9bb4648df90b7f435bc5eadc38c26da011e /Lib/test/test_timeout.py
parentbc3101edfd79f9d63af2f7503c94e1c5390f9074 (diff)
parent8d7b2d90166762520cd2f911bb3bcaf71c41c98c (diff)
downloadcpython-03b9c293da396efd6df7fb0d980db0faa8bb4b49.tar.gz
null merge with 3.3
Diffstat (limited to 'Lib/test/test_timeout.py')
-rw-r--r--Lib/test/test_timeout.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py
index dcf201b507..703c43ab2b 100644
--- a/Lib/test/test_timeout.py
+++ b/Lib/test/test_timeout.py
@@ -207,7 +207,7 @@ class TCPTimeoutTestCase(TimeoutTestCase):
sock.connect((whitehole))
except socket.timeout:
pass
- except IOError as err:
+ except OSError as err:
if err.errno == errno.ECONNREFUSED:
skip = False
finally: