From: Trent Nelson <trent@trent.me>
Date: Sat, 27 Oct 2012 02:21:46 +0000 (-0400)
Subject: Issue #16274: Fix test_asyncore on Solaris.
X-Git-Tag: v2.7.4rc1~453
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9992292be1693c254a34577e4366707380ccebb;p=thirdparty%2FPython%2Fcpython.git

Issue #16274: Fix test_asyncore on Solaris.
---

diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
index b8dfad279f31..8f875ffb5f64 100644
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -484,8 +484,9 @@ class TCPServer(asyncore.dispatcher):
         return self.socket.getsockname()[:2]
 
     def handle_accept(self):
-        sock, addr = self.accept()
-        self.handler(sock)
+        pair = self.accept()
+        if pair is not None:
+            self.handler(pair[0])
 
     def handle_error(self):
         raise
diff --git a/Misc/NEWS b/Misc/NEWS
index 5052009e738d..216346e4a43d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -435,6 +435,8 @@ Extension Modules
 Tests
 -----
 
+- Issue #16274: Fix test_asyncore on Solaris.  Patch by Giampaolo Rodola'.
+
 - Issue #15040: Close files in mailbox tests for PyPy compatibility.
   Original patch by Matti Picus.