Merge w/ 3.5

This commit is contained in:
Brett Cannon 2016-02-20 18:40:18 -08:00
commit fe1941ebf8
1 changed files with 2 additions and 1 deletions

View File

@ -1281,7 +1281,8 @@ an :term:`importer`.
:meth:`~importlib.abc.Loader.exec_module` as control over what module type
is used for the module is required. For those same reasons, the loader's
:meth:`~importlib.abc.Loader.create_module` method will be ignored (i.e., the
loader's method should only return ``None``). Finally,
loader's method should only return ``None``; this excludes
:class:`BuiltinImporter` and :class:`ExtensionFileLoader`). Finally,
modules which substitute the object placed into :attr:`sys.modules` will
not work as there is no way to properly replace the module references
throughout the interpreter safely; :exc:`ValueError` is raised if such a