[Python-checkins] cpython (merge 3.2 -> default): #11112: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/116ed0ce5756
changeset:   73613:116ed0ce5756
parent:      73610:e12d2b9c88ef
parent:      73612:b410bcd300a1
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Nov 18 18:35:53 2011 +0200
summary:
  #11112: merge with 3.2.

files:
  Lib/test/test_socket.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -4184,7 +4184,7 @@
             # 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):

-- 
Repository URL: http://hg.python.org/cpython