diff options
| -rw-r--r-- | Doc/library/importlib.rst | 2 | ||||
| -rw-r--r-- | Lib/importlib/_bootstrap.py | 8 | ||||
| -rw-r--r-- | Lib/importlib/test/test_util.py | 6 | ||||
| -rw-r--r-- | Lib/importlib/util.py | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst index 4a0ff0e..1481302 100644 --- a/Doc/library/importlib.rst +++ b/Doc/library/importlib.rst @@ -185,7 +185,7 @@ an :term:`importer`. loader should initialize as specified by :pep:`302`. -.. function:: set___package__(method) +.. function:: set_package(method) A :term:`decorator` for a :term:`loader` to set the :attr:`__package__` attribute on the module returned by the loader. If :attr:`__package__` is diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index a2a29cc..4c13c7a 100644 --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -97,7 +97,7 @@ def wrap(new, old): new.__dict__.update(old.__dict__) -def set___package__(fxn): +def set_package(fxn): """Set __package__ on the returned module.""" def wrapper(*args, **kwargs): module = fxn(*args, **kwargs) @@ -131,7 +131,7 @@ class BuiltinImporter: return cls if imp.is_builtin(fullname) else None @classmethod - @set___package__ + @set_package def load_module(cls, fullname): """Load a built-in module.""" if fullname not in sys.builtin_module_names: @@ -160,7 +160,7 @@ class FrozenImporter: return cls if imp.is_frozen(fullname) else None @classmethod - @set___package__ + @set_package def load_module(cls, fullname): """Load a frozen module.""" if cls.find_module(fullname) is None: @@ -248,7 +248,7 @@ class _ExtensionFileLoader: raise ValueError("extension modules cannot be packages") @check_name - @set___package__ + @set_package def load_module(self, fullname): """Load an extension module.""" is_reload = fullname in sys.modules diff --git a/Lib/importlib/test/test_util.py b/Lib/importlib/test/test_util.py index 8bd35f1..706128a 100644 --- a/Lib/importlib/test/test_util.py +++ b/Lib/importlib/test/test_util.py @@ -63,13 +63,13 @@ class ModuleForLoaderTests(unittest.TestCase): class SetPackageTests(unittest.TestCase): - """Tests for importlib.util.set___package__.""" + """Tests for importlib.util.set_package.""" def verify(self, module, expect): """Verify the module has the expected value for __package__ after - passing through set___package__.""" + passing through set_package.""" fxn = lambda: module - wrapped = util.set___package__(fxn) + wrapped = util.set_package(fxn) wrapped() self.assert_(hasattr(module, '__package__')) self.assertEqual(expect, module.__package__) diff --git a/Lib/importlib/util.py b/Lib/importlib/util.py index 2b6154b..9022ab8 100644 --- a/Lib/importlib/util.py +++ b/Lib/importlib/util.py @@ -1,3 +1,3 @@ """Utility code for constructing importers, etc.""" from ._bootstrap import module_for_loader -from ._bootstrap import set___package__ +from ._bootstrap import set_package |