[pypy-commit] pypy kill-someobject: fixes to socket

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: kill-someobject
Changeset: r57991:4a0c4724828d
Date: 2012-10-10 22:24 +0200
http://bitbucket.org/pypy/pypy/changeset/4a0c4724828d/

Log:	fixes to socket

diff --git a/pypy/module/_socket/interp_func.py b/pypy/module/_socket/interp_func.py
--- a/pypy/module/_socket/interp_func.py
+++ b/pypy/module/_socket/interp_func.py
@@ -1,4 +1,4 @@
-from pypy.interpreter.gateway import unwrap_spec
+from pypy.interpreter.gateway import unwrap_spec, W_Root
 from pypy.module._socket.interp_socket import converted_error, W_RSocket
 from pypy.rlib import rsocket
 from pypy.rlib.rsocket import SocketError, INVALID_SOCKET
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
@@ -1,7 +1,7 @@
 from pypy.interpreter.baseobjspace import Wrappable
 from pypy.interpreter.typedef import TypeDef, make_weakref_descr,\
      interp_attrproperty
-from pypy.interpreter.gateway import interp2app, unwrap_spec
+from pypy.interpreter.gateway import interp2app, unwrap_spec, W_Root
 from pypy.rlib.rarithmetic import intmask
 from pypy.rlib import rsocket
 from pypy.rlib.rsocket import RSocket, AF_INET, SOCK_STREAM
@@ -160,7 +160,9 @@
         except SocketError, e:
             raise converted_error(space, e)
 
-    def makefile_w(self, space, w_mode="r", w_buffsize=-1):
+    @unwrap_spec(w_mode = (W_Root, 'space.wrap("r")'),
+                 w_buffsize = (W_Root, 'space.wrap(-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.