[pypy-commit] pypy fix-tpname: kill get_module_type_name, fix some cases

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: fix-tpname
Changeset: r71173:2e04ced7667d
Date: 2014-05-01 21:13 -0400
http://bitbucket.org/pypy/pypy/changeset/2e04ced7667d/

Log:	kill get_module_type_name, fix some cases

diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py
--- a/pypy/interpreter/error.py
+++ b/pypy/interpreter/error.py
@@ -363,7 +363,7 @@
                     if fmt == 'R':
                         result = space.str_w(space.repr(value))
                     elif fmt == 'T':
-                        result = space.type(value).get_module_type_name()
+                        result = space.type(value).name
                     elif fmt == 'N':
                         result = value.getname(space)
                     else:
@@ -404,7 +404,7 @@
 
     %N - The result of w_arg.getname(space)
     %R - The result of space.str_w(space.repr(w_arg))
-    %T - The result of space.type(w_arg).get_module_type_name()
+    %T - The result of space.type(w_arg).name
 
     """
     if not len(args):
diff --git a/pypy/module/_lsprof/interp_lsprof.py b/pypy/module/_lsprof/interp_lsprof.py
--- a/pypy/module/_lsprof/interp_lsprof.py
+++ b/pypy/module/_lsprof/interp_lsprof.py
@@ -199,7 +199,7 @@
         if isinstance(w_type, W_TypeObject):
             w_realclass, _ = space.lookup_in_type_where(w_type, name)
             if isinstance(w_realclass, W_TypeObject):
-                class_name = w_realclass.get_module_type_name()
+                class_name = w_realclass.name
     else:
         name = '?'
     if class_name is None:
@@ -440,7 +440,7 @@
     return space.wrap(p)
 
 W_Profiler.typedef = TypeDef(
-    'Profiler',
+    '_lsprof.Profiler',
     __module__ = '_lsprof',
     __new__ = interp2app(descr_new_profile),
     enable = interp2app(W_Profiler.enable),
diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -488,7 +488,7 @@
             return space.wrap(s)
 
 W_ArrayBase.typedef = TypeDef(
-    'array',
+    'array.array',
     __new__ = interp2app(w_array),
     __module__ = 'array',
 
diff --git a/pypy/module/exceptions/interp_exceptions.py b/pypy/module/exceptions/interp_exceptions.py
--- a/pypy/module/exceptions/interp_exceptions.py
+++ b/pypy/module/exceptions/interp_exceptions.py
@@ -244,7 +244,7 @@
     for k, v in kwargs.items():
         kwargs[k] = interp2app(v.__get__(None, realbase))
     W_Exc.typedef = TypeDef(
-        name,
+        'exceptions.' + name,
         base.typedef,
         __doc__ = W_Exc.__doc__,
         __module__ = 'exceptions',
diff --git a/pypy/objspace/fake/objspace.py b/pypy/objspace/fake/objspace.py
--- a/pypy/objspace/fake/objspace.py
+++ b/pypy/objspace/fake/objspace.py
@@ -73,9 +73,6 @@
     def get_module(self):
         return w_some_obj()
 
-    def get_module_type_name(self):
-        return self.name
-
 def w_some_obj():
     if NonConstant(False):
         return W_Root()
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
@@ -485,16 +485,6 @@
                 mod = "__builtin__"
             return space.wrap(mod)
 
-    def get_module_type_name(w_self):
-        space = w_self.space
-        if not w_self.is_heaptype():
-            w_mod = w_self.get_module()
-            if space.isinstance_w(w_mod, space.w_str):
-                mod = space.str_w(w_mod)
-                if mod != '__builtin__':
-                    return '%s.%s' % (mod, w_self.name)
-        return w_self.name
-
     def getname(self, space):
         if self.is_heaptype():
             return self.name
@@ -1113,7 +1103,7 @@
     else:
         kind = 'class'
     if mod is not None and mod != '__builtin__':
-        return space.wrap("<%s '%s.%s'>" % (kind, mod, w_obj.name))
+        return space.wrap("<%s '%s.%s'>" % (kind, mod, w_obj.getname(space)))
     else:
         return space.wrap("<%s '%s'>" % (kind, w_obj.name))