[pypy-commit] pypy py3k: remove _socket.makefile: it's now implemented in socket.py.
amauryfa
noreply at buildbot.pypy.org
Wed Oct 24 00:56:10 CEST 2012
Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: py3k
Changeset: r58389:9f64095856e5
Date: 2012-10-23 22:44 +0200
http://bitbucket.org/pypy/pypy/changeset/9f64095856e5/
Log: remove _socket.makefile: it's now implemented in socket.py.
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
@@ -179,16 +179,6 @@
except SocketError, e:
raise converted_error(space, e)
- @unwrap_spec(w_mode = WrappedDefault("r"),
- w_buffsize = WrappedDefault(-1))
- def makefile_w(self, space, w_mode=None, w_buffsize=None):
- """makefile([mode[, buffersize]]) -> file object
-
- Return a regular file object corresponding to the socket.
- The mode and buffersize arguments are as for the built-in open() function.
- """
- return app_makefile(space, self, w_mode, w_buffsize)
-
@unwrap_spec(buffersize='nonnegint', flags=int)
def recv_w(self, space, buffersize, flags=0):
"""recv(buffersize[, flags]) -> data
@@ -422,17 +412,6 @@
return
self.close_w(space)
-app_makefile = gateway.applevel(r'''
-def makefile(self, mode="r", buffersize=-1):
- """makefile([mode[, buffersize]]) -> file object
-
- Return a regular file object corresponding to the socket.
- The mode and buffersize arguments are as for the built-in open() function.
- """
- import os
- newfd = os.dup(self.fileno())
- return os.fdopen(newfd, mode, buffersize)
-''', filename =__file__).interphook('makefile')
# ____________________________________________________________
# Error handling
@@ -474,7 +453,7 @@
socketmethodnames = """
_accept bind close connect connect_ex dup fileno detach
-getpeername getsockname getsockopt gettimeout listen makefile
+getpeername getsockname getsockopt gettimeout listen
recv recvfrom send sendall sendto setblocking
setsockopt settimeout shutdown _reuse _drop recv_into recvfrom_into
""".split()
@@ -516,7 +495,6 @@
getsockopt(level, optname[, buflen]) -- get socket options
gettimeout() -- return timeout or None
listen(n) -- start listening for incoming connections
-makefile([mode, [bufsize]]) -- return a file object for the socket [*]
recv(buflen[, flags]) -- receive data
recvfrom(buflen[, flags]) -- receive data and sender's address
sendall(data[, flags]) -- send all data
More information about the pypy-commit
mailing list