[pypy-svn] pypy default: simplify the fileno() handling

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r41504:744228d9b7ec
Date: 2011-01-31 21:03 +0200
http://bitbucket.org/pypy/pypy/changeset/744228d9b7ec/

Log:	simplify the fileno() handling

diff --git a/pypy/rlib/rsocket.py b/pypy/rlib/rsocket.py
--- a/pypy/rlib/rsocket.py
+++ b/pypy/rlib/rsocket.py
@@ -838,9 +838,6 @@
             return make_socket(fd, self.family, self.type, self.proto,
                                SocketClass=SocketClass)
         
-    def fileno(self):
-        return self.fd
-
     def getpeername(self):
         """Return the address of the remote endpoint."""
         address, addr_p, addrlen_p = self._addrbuf()

diff --git a/pypy/module/_socket/interp_socket.py b/pypy/module/_socket/interp_socket.py
--- a/pypy/module/_socket/interp_socket.py
+++ b/pypy/module/_socket/interp_socket.py
@@ -102,11 +102,7 @@
 
         Return the integer file descriptor of the socket.
         """
-        try:
-            fd = self.fileno()
-        except SocketError, e:
-            raise converted_error(space, e)
-        return space.wrap(intmask(fd))
+        return space.wrap(intmask(self.fd))
     fileno_w.unwrap_spec = ['self', ObjSpace]
 
     def getpeername_w(self, space):

diff --git a/pypy/rlib/test/test_rsocket.py b/pypy/rlib/test/test_rsocket.py
--- a/pypy/rlib/test/test_rsocket.py
+++ b/pypy/rlib/test/test_rsocket.py
@@ -353,7 +353,7 @@
     s.setsockopt_int(SOL_SOCKET, SO_REUSEADDR, 1)
     s.bind(INETAddress('localhost', 50007))
     s2 = s.dup()
-    assert s.fileno() != s2.fileno()
+    assert s.fd != s2.fd
     assert s.getsockname().eq(s2.getsockname())
 
 def test_inet_aton():