From: Martin v. Löwis <martin@v.loewis.de>
Date: Wed, 19 Sep 2001 17:31:47 +0000 (+0000)
Subject: Patch #461321: Support None as a timeout in poll2 and poll3.
X-Git-Tag: v2.2.1c1~1728
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6cc07cffe902d8faef5f3cce7a2ea8cda939e02;p=thirdparty%2FPython%2Fcpython.git

Patch #461321: Support None as a timeout in poll2 and poll3.
---

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index f221d4c18e97..5175002a3169 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -110,8 +110,9 @@ def poll2 (timeout=0.0, map=None):
     import poll
     if map is None:
         map=socket_map
-    # timeout is in milliseconds
-    timeout = int(timeout*1000)
+    if timeout is not None:
+        # timeout is in milliseconds
+        timeout = int(timeout*1000)
     if map:
         l = []
         for fd, obj in map.items():
@@ -142,8 +143,9 @@ def poll3 (timeout=0.0, map=None):
     # Use the poll() support added to the select module in Python 2.0
     if map is None:
         map=socket_map
-    # timeout is in milliseconds
-    timeout = int(timeout*1000)
+    if timeout is not None:
+        # timeout is in milliseconds
+        timeout = int(timeout*1000)
     pollster = select.poll()
     if map:
         for fd, obj in map.items():