From: Facundo Batista <facundobatista@gmail.com>
Date: Thu, 19 Jul 2007 23:57:38 +0000 (+0000)
Subject: Added a select.select call in the test server loop to make sure the
X-Git-Tag: v2.6a1~1555
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1994b4a5d0139a010eb0af1d6615a3df92fe786;p=thirdparty%2FPython%2Fcpython.git

Added a select.select call in the test server loop to make sure the
socket is ready to be read from before attempting a read (this
prevents an error 10035 on some Windows platforms). [GSoC - Alan
McIntyre]
---

diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
index 7602b9fca66e..03481e809f4a 100644
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -65,11 +65,13 @@ def capture_server(evt, buf):
     else:
         n = 200
         while n > 0:
-            data = conn.recv(10)
-            # keep everything except for the newline terminator
-            buf.write(data.replace('\n', ''))
-            if '\n' in data:
-                break
+            r, w, e = select.select([conn], [], [])
+            if r:
+                data = conn.recv(10)
+                # keep everything except for the newline terminator
+                buf.write(data.replace('\n', ''))
+                if '\n' in data:
+                    break
             n -= 1
             time.sleep(0.01)