[Checkins] SVN: zc.ngi/trunk/src/zc/ngi/async fixing one fatal win32 problem and one win32-test failure

Adam Groszer agroszer at gmail.com
Fri Jan 15 09:49:09 EST 2010


Log message for revision 108149:
  fixing one fatal win32 problem and one win32-test failure

Changed:
  U   zc.ngi/trunk/src/zc/ngi/async-udp.test
  U   zc.ngi/trunk/src/zc/ngi/async.py

-=-
Modified: zc.ngi/trunk/src/zc/ngi/async-udp.test
===================================================================
--- zc.ngi/trunk/src/zc/ngi/async-udp.test	2010-01-15 14:15:00 UTC (rev 108148)
+++ zc.ngi/trunk/src/zc/ngi/async-udp.test	2010-01-15 14:49:09 UTC (rev 108149)
@@ -2,22 +2,29 @@
 -----------------
 
     >>> import zc.ngi.async, time
+    >>> import sys
 
-    >>> zc.ngi.async.udp(('', 9644), 'test')
+    >>> if sys.platform == 'win32':
+    ...     addr = '127.0.0.1'
+    ... else:
+    ...     addr = ''
 
+
+    >>> zc.ngi.async.udp((addr, 9644), 'test')
+
     >>> def handler(addr, message):
     ...     print message
 
-    >>> listener = zc.ngi.async.udp_listener(('', 9644), handler)
+    >>> listener = zc.ngi.async.udp_listener((addr, 9644), handler)
     >>> time.sleep(0.1)
 
-    >>> zc.ngi.async.udp(('', 9644), 'test'); time.sleep(0.1)
+    >>> zc.ngi.async.udp((addr, 9644), 'test'); time.sleep(0.1)
     test
 
-    >>> zc.ngi.async.udp(('', 9644), 'test'); time.sleep(0.1)
+    >>> zc.ngi.async.udp((addr, 9644), 'test'); time.sleep(0.1)
     test
 
     >>> listener.close()
     >>> time.sleep(0.1)
 
-    >>> zc.ngi.async.udp(('', 9644), 'test'); time.sleep(0.1)
+    >>> zc.ngi.async.udp((addr, 9644), 'test'); time.sleep(0.1)

Modified: zc.ngi/trunk/src/zc/ngi/async.py
===================================================================
--- zc.ngi/trunk/src/zc/ngi/async.py	2010-01-15 14:15:00 UTC (rev 108148)
+++ zc.ngi/trunk/src/zc/ngi/async.py	2010-01-15 14:49:09 UTC (rev 108149)
@@ -29,6 +29,7 @@
 import zc.ngi
 
 pid = os.getpid()
+is_win32 = sys.platform == 'win32'
 
 _map = {}
 _connectors = {}
@@ -455,7 +456,10 @@
         self.socket.close()
 
 # udp uses GIL to get thread-safe socket management
-_udp_socks = {socket.AF_INET: [], socket.AF_UNIX: []}
+if is_win32:
+    _udp_socks = {socket.AF_INET: []}
+else:
+    _udp_socks = {socket.AF_INET: [], socket.AF_UNIX: []}
 def udp(address, message):
     if isinstance(address, str):
         family = socket.AF_UNIX



More information about the checkins mailing list