[pypy-svn] r80008 - pypy/branch/fast-forward/pypy/module/select

[agaynor at codespeak.net]

Author: agaynor
Date: Sun Dec 12 20:38:01 2010
New Revision: 80008

Modified:
   pypy/branch/fast-forward/pypy/module/select/interp_epoll.py
Log:
Fixed epoll after the merge.


Modified: pypy/branch/fast-forward/pypy/module/select/interp_epoll.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/select/interp_epoll.py	(original)
+++ pypy/branch/fast-forward/pypy/module/select/interp_epoll.py	Sun Dec 12 20:38:01 2010
@@ -7,7 +7,6 @@
 from pypy.interpreter.gateway import interp2app, unwrap_spec, ObjSpace, W_Root
 from pypy.interpreter.error import OperationError, wrap_oserror, operationerrfmt
 from pypy.interpreter.typedef import TypeDef, GetSetProperty
-from pypy.module.select.interp_select import as_fd_w
 from pypy.rpython.lltypesystem import lltype, rffi
 from pypy.rpython.tool import rffi_platform
 from pypy.rlib._rsocket_rffi import socketclose, FD_SETSIZE
@@ -101,7 +100,7 @@
             self.epfd = -1
 
     def epoll_ctl(self, ctl, w_fd, eventmask, ignore_ebadf=False):
-        fd = as_fd_w(self.space, w_fd)
+        fd = self.space.c_filedescriptor_w(w_fd)
         with lltype.scoped_alloc(epoll_event) as ev:
             ev.c_events = rffi.cast(rffi.UINT, eventmask)
             rffi.setintfield(ev.c_data, 'c_fd', fd)