Author: Carl Friedrich Bolz <[email protected]>
Branch: py3.5
Changeset: r88751:1b3860266dbd
Date: 2016-11-29 17:45 +0100
http://bitbucket.org/pypy/pypy/changeset/1b3860266dbd/
Log: just call importlib._module_repr directly
diff --git a/pypy/interpreter/module.py b/pypy/interpreter/module.py
--- a/pypy/interpreter/module.py
+++ b/pypy/interpreter/module.py
@@ -121,32 +121,8 @@
return space.newtuple(tup_return)
def descr_module__repr__(self, space):
- w_loader = space.finditem(self.w_dict, space.wrap('__loader__'))
- if w_loader is not None:
- try:
- return space.call_method(w_loader, "module_repr", self)
- except OperationError, operr:
- if not operr.match(space, space.w_Exception):
- raise
- try:
- w_name = space.getattr(self, space.wrap('__name__'))
- name = space.unicode_w(space.repr(w_name))
- except OperationError:
- name = u"'?'"
-
- try:
- w___file__ = space.getattr(self, space.wrap('__file__'))
- except OperationError:
- w___file__ = space.w_None
- if not space.isinstance_w(w___file__, space.w_unicode):
- if w_loader is not None:
- w_loader_repr = space.unicode_w(space.repr(w_loader))
- return space.wrap(u"<module %s (%s)>" % (name, w_loader_repr))
- else:
- return space.wrap(u"<module %s>" % (name,))
- else:
- __file__ = space.unicode_w(space.repr(w___file__))
- return space.wrap(u"<module %s from %s>" % (name, __file__))
+ w_importlib = space.getbuiltinmodule('_frozen_importlib')
+ return space.call_method(w_importlib, "_module_repr", self)
def descr_getattribute(self, space, w_attr):
from pypy.objspace.descroperation import object_getattribute
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
