Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r74147:e94bbc8ce02b
Date: 2014-10-23 17:13 -0700
http://bitbucket.org/pypy/pypy/changeset/e94bbc8ce02b/
Log: fix
diff --git a/pypy/objspace/std/complexobject.py
b/pypy/objspace/std/complexobject.py
--- a/pypy/objspace/std/complexobject.py
+++ b/pypy/objspace/std/complexobject.py
@@ -6,6 +6,7 @@
from pypy.objspace.std import newformat
from pypy.objspace.std.floatobject import _hash_float
from pypy.objspace.std.stdtypedef import GetSetProperty, StdTypeDef
+from pypy.objspace.std.unicodeobject import unicode_to_decimal_w
from rpython.rlib import jit, rcomplex
from rpython.rlib.rarithmetic import intmask, r_ulonglong
from rpython.rlib.rbigint import rbigint
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
@@ -583,9 +583,9 @@
else:
mod = space.unicode_w(w_mod)
if mod is not None and mod != u'builtins':
- return space.wrap(u"<class '%s.%s'>" % (mod, w_obj.getname(space)))
+ return space.wrap(u"<class '%s.%s'>" % (mod, self.getname(space)))
else:
- return space.wrap(u"<class '%s'>" % (w_obj.name.decode('utf-8')))
+ return space.wrap(u"<class '%s'>" % (self.name.decode('utf-8')))
def descr_getattribute(self, space, w_name):
name = space.str_w(w_name)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
