]> granicus.if.org Git - python/commitdiff
(Merge 3.4) Fix repr(_socket.socket) on Windows 64-bit: don't fail with
authorVictor Stinner <victor.stinner@gmail.com>
Sat, 26 Jul 2014 12:37:57 +0000 (14:37 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Sat, 26 Jul 2014 12:37:57 +0000 (14:37 +0200)
OverflowError on closed socket. repr(socket.socket) already works fine.

1  2 
Lib/test/test_socket.py
Misc/NEWS
Modules/socketmodule.c

Simple merge
diff --cc Misc/NEWS
index b120f70fd9852642d25cc3d159c71b1065282178,9f7ca1dfcbb1b3544911724b27623d422b3e1035..c510a1a582d40652c71b046688c68811bc53dc9e
+++ b/Misc/NEWS
@@@ -108,12 -27,9 +108,15 @@@ Core and Builtin
  Library
  -------
  
+ - Fix repr(_socket.socket) on Windows 64-bit: don't fail with OverflowError
+   on closed socket. repr(socket.socket) already works fine.
 +- Issue #22033: Reprs of most Python implemened classes now contain actual
 +  class name instead of hardcoded one.
 +
 +- Issue #21947: The dis module can now disassemble generator-iterator
 +  objects based on their gi_code attribute. Patch by Clement Rouault.
 +
  - Issue #16133: The asynchat.async_chat.handle_read() method now ignores
    BlockingIOError exceptions.
  
Simple merge