Author: Brian Kearns <[email protected]>
Branch: fix-tpname
Changeset: r71210:1a89979e6d52
Date: 2014-05-02 18:52 -0400
http://bitbucket.org/pypy/pypy/changeset/1a89979e6d52/
Log: additional fixes
diff --git a/pypy/module/_io/interp_bufferedio.py
b/pypy/module/_io/interp_bufferedio.py
--- a/pypy/module/_io/interp_bufferedio.py
+++ b/pypy/module/_io/interp_bufferedio.py
@@ -211,17 +211,16 @@
return space.call_method(self.w_raw, "isatty")
def repr_w(self, space):
- typename = space.type(self).getname(space)
- module = space.str_w(space.type(self).get_module())
+ typename = space.type(self).name
try:
w_name = space.getattr(self, space.wrap("name"))
except OperationError, e:
if not e.match(space, space.w_AttributeError):
raise
- return space.wrap("<%s.%s>" % (module, typename,))
+ return space.wrap("<%s>" % (typename,))
else:
name_repr = space.str_w(space.repr(w_name))
- return space.wrap("<%s.%s name=%s>" % (module, typename,
name_repr))
+ return space.wrap("<%s name=%s>" % (typename, name_repr))
# ______________________________________________
diff --git a/pypy/objspace/std/test/test_typeobject.py
b/pypy/objspace/std/test/test_typeobject.py
--- a/pypy/objspace/std/test/test_typeobject.py
+++ b/pypy/objspace/std/test/test_typeobject.py
@@ -701,7 +701,9 @@
class A(object):
pass
assert repr(A) == "<class 'a.A'>"
- assert repr(type(type)) == "<type 'type'>"
+ A.__module__ = 123
+ assert repr(A) == "<class 'A'>"
+ assert repr(type(type)) == "<type 'type'>"
assert repr(complex) == "<type 'complex'>"
assert repr(property) == "<type 'property'>"
assert repr(TypeError) == "<type 'exceptions.TypeError'>"
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
@@ -1098,7 +1098,7 @@
def repr__Type(space, w_obj):
w_mod = w_obj.get_module()
- if not space.isinstance_w(w_mod, space.w_str):
+ if w_mod is None or not space.isinstance_w(w_mod, space.w_str):
mod = None
else:
mod = space.str_w(w_mod)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
