summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_socket.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-11-18 16:35:53 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-11-18 16:35:53 (GMT)
commit4a7abe7ca6dae0d029759941762175bfa78bf4af (patch)
tree90910e1f0b50394d3349303c86715da25421c684 /Lib/test/test_socket.py
parent304261e85dd494b3b18779217d6753bb2939c512 (diff)
parent7f78ddc3adf77adf1e8a72788ca8306fe3abd782 (diff)
downloadcpython-4a7abe7ca6dae0d029759941762175bfa78bf4af.zip
cpython-4a7abe7ca6dae0d029759941762175bfa78bf4af.tar.gz
cpython-4a7abe7ca6dae0d029759941762175bfa78bf4af.tar.bz2
#11112: merge with 3.2.
Diffstat (limited to 'Lib/test/test_socket.py')
-rw-r--r--Lib/test/test_socket.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 7aef8e9..221a507 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -4184,7 +4184,7 @@ class TCPTimeoutTest(SocketTCPTest):
# no alarm can be pending. Safe to restore old handler.
signal.signal(signal.SIGALRM, old_alarm)
-class UDPTimeoutTest(SocketTCPTest):
+class UDPTimeoutTest(SocketUDPTest):
def testUDPTimeout(self):
def raise_timeout(*args, **kwargs):