[pypy-svn] r34419 - pypy/dist/pypy/module/rsocket

ac at codespeak.net ac at codespeak.net
Thu Nov 9 16:44:47 CET 2006


Author: ac
Date: Thu Nov  9 16:44:47 2006
New Revision: 34419

Modified:
   pypy/dist/pypy/module/rsocket/interp_socket.py
Log:
Oops, forgotten change.

Modified: pypy/dist/pypy/module/rsocket/interp_socket.py
==============================================================================
--- pypy/dist/pypy/module/rsocket/interp_socket.py	(original)
+++ pypy/dist/pypy/module/rsocket/interp_socket.py	Thu Nov  9 16:44:47 2006
@@ -217,8 +217,11 @@
                 data, addr = self.recvfrom(buffersize, flags)
             finally:
                 if GIL is not None: GIL.acquire(True)
-            return space.newtuple([space.wrap(data),
-                                   addr.as_object(space)])
+            if addr:
+                w_addr = addr.as_object(space)
+            else:
+                w_addr = space.w_None
+            return space.newtuple([space.wrap(data), w_addr])
         except SocketError, e:
             raise converted_error(space, e)
     recvfrom_w.unwrap_spec = ['self', ObjSpace, int, int]



More information about the Pypy-commit mailing list