Commit 817641a3 authored by Brett Cannon's avatar Brett Cannon

Rename importlib.util.set___package__ to set_package.

parent bada715c
...@@ -185,7 +185,7 @@ an :term:`importer`. ...@@ -185,7 +185,7 @@ an :term:`importer`.
loader should initialize as specified by :pep:`302`. 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__` A :term:`decorator` for a :term:`loader` to set the :attr:`__package__`
attribute on the module returned by the loader. If :attr:`__package__` is attribute on the module returned by the loader. If :attr:`__package__` is
......
...@@ -97,7 +97,7 @@ def wrap(new, old): ...@@ -97,7 +97,7 @@ def wrap(new, old):
new.__dict__.update(old.__dict__) new.__dict__.update(old.__dict__)
def set___package__(fxn): def set_package(fxn):
"""Set __package__ on the returned module.""" """Set __package__ on the returned module."""
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
module = fxn(*args, **kwargs) module = fxn(*args, **kwargs)
...@@ -131,7 +131,7 @@ class BuiltinImporter: ...@@ -131,7 +131,7 @@ class BuiltinImporter:
return cls if imp.is_builtin(fullname) else None return cls if imp.is_builtin(fullname) else None
@classmethod @classmethod
@set___package__ @set_package
def load_module(cls, fullname): def load_module(cls, fullname):
"""Load a built-in module.""" """Load a built-in module."""
if fullname not in sys.builtin_module_names: if fullname not in sys.builtin_module_names:
...@@ -160,7 +160,7 @@ class FrozenImporter: ...@@ -160,7 +160,7 @@ class FrozenImporter:
return cls if imp.is_frozen(fullname) else None return cls if imp.is_frozen(fullname) else None
@classmethod @classmethod
@set___package__ @set_package
def load_module(cls, fullname): def load_module(cls, fullname):
"""Load a frozen module.""" """Load a frozen module."""
if cls.find_module(fullname) is None: if cls.find_module(fullname) is None:
...@@ -248,7 +248,7 @@ class _ExtensionFileLoader: ...@@ -248,7 +248,7 @@ class _ExtensionFileLoader:
raise ValueError("extension modules cannot be packages") raise ValueError("extension modules cannot be packages")
@check_name @check_name
@set___package__ @set_package
def load_module(self, fullname): def load_module(self, fullname):
"""Load an extension module.""" """Load an extension module."""
is_reload = fullname in sys.modules is_reload = fullname in sys.modules
......
...@@ -63,13 +63,13 @@ class ModuleForLoaderTests(unittest.TestCase): ...@@ -63,13 +63,13 @@ class ModuleForLoaderTests(unittest.TestCase):
class SetPackageTests(unittest.TestCase): class SetPackageTests(unittest.TestCase):
"""Tests for importlib.util.set___package__.""" """Tests for importlib.util.set_package."""
def verify(self, module, expect): def verify(self, module, expect):
"""Verify the module has the expected value for __package__ after """Verify the module has the expected value for __package__ after
passing through set___package__.""" passing through set_package."""
fxn = lambda: module fxn = lambda: module
wrapped = util.set___package__(fxn) wrapped = util.set_package(fxn)
wrapped() wrapped()
self.assert_(hasattr(module, '__package__')) self.assert_(hasattr(module, '__package__'))
self.assertEqual(expect, module.__package__) self.assertEqual(expect, module.__package__)
......
"""Utility code for constructing importers, etc.""" """Utility code for constructing importers, etc."""
from ._bootstrap import module_for_loader from ._bootstrap import module_for_loader
from ._bootstrap import set___package__ from ._bootstrap import set_package
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment