Author: Mark Young <marky1...@gmail.com>
Branch: fix_module_repr
Changeset: r82473:89cec61d8f3d
Date: 2016-02-20 13:46 -0500
http://bitbucket.org/pypy/pypy/changeset/89cec61d8f3d/
Log: Fix module repr as per PEP 420.
diff --git a/pypy/interpreter/module.py b/pypy/interpreter/module.py
--- a/pypy/interpreter/module.py
+++ b/pypy/interpreter/module.py
@@ -1,5 +1,5 @@
"""
-Module objects.
+eodule objects.
"""
from pypy.interpreter.baseobjspace import W_Root
@@ -121,20 +121,36 @@
return space.newtuple(tup_return)
def descr_module__repr__(self, space):
- if self.w_name is not None:
- name = space.unicode_w(space.repr(self.w_name))
- nonrepr_name = self.space.identifier_w(self.w_name)
- else:
- name = u"'?'"
- nonrepr_name = "?"
- if nonrepr_name in self.space.builtin_modules:
- return space.wrap(u"<module %s (built-in)>" % name)
+ w_loader = space.finditem(self.w_dict, space.wrap('__loader__'))
+ if w_loader is not None:
+ try:
+ w_repr = space.call_method(w_loader, "module_repr",
+ space.wrap(self))
+ except OperationError:
+ w_repr = None
+
+ if w_repr is not None:
+ return w_repr
+
+ try:
+ w_name = space.getattr(self, space.wrap('__name__'))
+ except OperationError:
+ w_name = space.wrap(u'?')
+ name = space.unicode_w(space.repr(w_name))
+
try:
w___file__ = space.getattr(self, space.wrap('__file__'))
+ except OperationError:
+ w___file__ = space.w_None
+ if not space.is_true(space.isinstance(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__))
- except OperationError:
- __file__ = u'?'
- return space.wrap(u"<module %s from %s>" % (name, __file__))
+ return space.wrap(u"<module %s from %s>" % (name, __file__))
def descr_module__dir__(self, space):
w_dict = space.getattr(self, space.wrap('__dict__'))
diff --git a/pypy/interpreter/test/test_module.py
b/pypy/interpreter/test/test_module.py
--- a/pypy/interpreter/test/test_module.py
+++ b/pypy/interpreter/test/test_module.py
@@ -74,11 +74,99 @@
r'lib_pypy\\_pypy_interact.py' in r.lower()) and
r.endswith('>'))
nofile = type(_pypy_interact)('nofile', 'foo')
- assert repr(nofile) == "<module 'nofile' from ?>"
+ assert repr(nofile) == "<module 'nofile'>"
m = type(_pypy_interact).__new__(type(_pypy_interact))
assert repr(m).startswith("<module '?'")
+ def test_repr_with_loader_with_valid_module_repr(self):
+ import _frozen_importlib, sys
+ test_module = type(sys)("test_module", "doc")
+
+ # If the module has a __loader__ and that loader has a module_repr()
+ # method, call it with a single argument, which is the module object.
+ # The value returned is used as the module’s repr.
+ class CustomLoader(_frozen_importlib.BuiltinImporter):
+ """Operates just like the builtin importer, but returns its own
+ special repr."""
+ @classmethod
+ def module_repr(cls, module):
+ mod_repr = ("<module {mod_name}: "
+ "{cls}
Test>".format(mod_name=repr(module.__name__),
+ cls=repr(cls.__name__)))
+ return mod_repr
+ test_module.__loader__ = CustomLoader
+ assert repr(test_module) == "<module 'test_module': 'CustomLoader'
Test>"
+
+ def test_repr_with_loader_with_module_repr_wrong_type(self):
+ import _frozen_importlib, sys
+ test_module = type(sys)("test_module", "doc")
+
+ # This return value must be a string.
+ class BuggyCustomLoader(_frozen_importlib.BuiltinImporter):
+ """Operates just like the builtin importer, but implements a
+ module_repr method that returns a non-string value."""
+ @classmethod
+ def module_repr(cls, module):
+ return 5
+
+ test_module.__loader__ = BuggyCustomLoader
+ try:
+ repr(test_module)
+ assert False, "module_repr must fail if it returns a nonstring."
+ except TypeError:
+ pass
+
+ def test_repr_with_loader_with_raising_module_repr(self):
+ import _frozen_importlib, sys
+ test_module = type(sys)("test_module", "doc")
+ # If an exception occurs in module_repr(), the exception is caught
+ # and discarded, and the calculation of the module’s repr
continues
+ # as if module_repr() did not exist.
+ class CustomLoaderWithRaisingRepr(_frozen_importlib.BuiltinImporter):
+ """Operates just like the builtin importer, but implements a
+ module_repr method that raises an exception."""
+ @classmethod
+ def module_repr(cls, module):
+ return repr(1/0)
+
+ test_module.__loader__ = CustomLoaderWithRaisingRepr
+ mod_repr = repr(test_module)
+
+ # The module has no __file__ attribute, so the repr should use
+ # the loader and name
+ loader_repr = repr(test_module.__loader__)
+ expected_repr = "<module 'test_module' ({})>".format(loader_repr)
+ assert mod_repr == expected_repr
+
+ def test_repr_with_raising_loader_and___file__(self):
+ import _frozen_importlib, sys
+ test_module = type(sys)("test_module", "doc")
+ test_module.__file__ = "/fake_dir/test_module.py"
+ class CustomLoaderWithRaisingRepr(_frozen_importlib.BuiltinImporter):
+ """Operates just like the builtin importer, but implements a
+ module_repr method that raises an exception."""
+ @classmethod
+ def module_repr(cls, module):
+ return repr(1/0)
+
+ test_module.__loader__ = CustomLoaderWithRaisingRepr
+
+ # If the module has an __file__ attribute, this is used as part
+ # of the module's repr.
+ # (If we have a loader that doesn't correctly implement module_repr,
+ # if we have a path, we always just use name and path.
+ expected_repr = "<module 'test_module' from
'/fake_dir/test_module.py'>"
+ assert repr(test_module) == expected_repr
+
+ def test_repr_with_missing_name(self):
+ import _frozen_importlib, sys
+ test_module = type(sys)("test_module", "doc")
+ del test_module.__name__
+ mod_repr = repr(test_module)
+ assert mod_repr == "<module '?'>"
+
+
def test_dir(self):
import sys
items = sys.__dir__()
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
