Author: Brian Kearns <[email protected]>
Branch: fix-tpname
Changeset: r71177:72bff2dbc7f4
Date: 2014-05-01 21:32 -0400
http://bitbucket.org/pypy/pypy/changeset/72bff2dbc7f4/
Log: adjust more
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
@@ -600,8 +600,7 @@
method = getattr(W_RSocket, methodname + '_w')
socketmethods[methodname] = interp2app(method)
-W_RSocket.typedef = TypeDef("socket",
- __module__ = "_socket",
+W_RSocket.typedef = TypeDef("_socket.socket",
__doc__ = """\
socket([family[, type[, proto]]]) -> socket object
diff --git a/pypy/objspace/std/typeobject.py b/pypy/objspace/std/typeobject.py
--- a/pypy/objspace/std/typeobject.py
+++ b/pypy/objspace/std/typeobject.py
@@ -620,7 +620,7 @@
def descr_get__name__(space, w_type):
w_type = _check(space, w_type)
- return space.wrap(w_type.name)
+ return space.wrap(w_type.getname(space))
def descr_set__name__(space, w_type, w_value):
w_type = _check(space, w_type)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
