[pypy-svn] r42338 - pypy/dist/pypy/module/rsocket
afa at codespeak.net
afa at codespeak.net
Wed Apr 25 23:39:45 CEST 2007
Author: afa
Date: Wed Apr 25 23:39:44 2007
New Revision: 42338
Modified:
pypy/dist/pypy/module/rsocket/interp_socket.py
Log:
Socket fd is unsigned on win32, but socket.fileno() must return an int in any case.
A test was broken since rev 42168.
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 Wed Apr 25 23:39:44 2007
@@ -2,6 +2,7 @@
from pypy.interpreter.typedef import TypeDef, make_weakref_descr
from pypy.interpreter.gateway import ObjSpace, W_Root, NoneNotWrapped
from pypy.interpreter.gateway import interp2app
+from pypy.rlib.rarithmetic import intmask
from pypy.rlib.rsocket import RSocket, AF_INET, SOCK_STREAM
from pypy.rlib.rsocket import SocketError, SocketErrorWithErrno
from pypy.interpreter.error import OperationError
@@ -126,7 +127,7 @@
fd = self.fileno()
except SocketError, e:
raise converted_error(space, e)
- return space.wrap(fd)
+ return space.wrap(intmask(fd))
fileno_w.unwrap_spec = ['self', ObjSpace]
def getpeername_w(self, space):
More information about the Pypy-commit
mailing list