Skip to content

bpo-44686 replace unittest.mock._importer with pkgutil.resolve_name #18544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 5 commits into from
Jul 21, 2021
Merged

bpo-44686 replace unittest.mock._importer with pkgutil.resolve_name #18544

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
077c3bc
replace unittest.mock._importer with pkgutil.resolve_name
graingert Feb 18, 2020
2f93c52
Merge branch 'main' into patch-3
graingert Jul 20, 2021
c4f43c9
fix merge resolution
graingert Feb 18, 2020
e9485d6
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 20, 2021
cf25db4
Update Misc/NEWS.d/next/Library/2021-07-20-19-35-49.bpo-44686.ucCGhu.rst
cjw296 Jul 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 4 additions & 23 deletions Lib/unittest/mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import pprint
import sys
import builtins
import pkgutil
from asyncio import iscoroutinefunction
from types import CodeType, ModuleType, MethodType
from unittest.util import safe_repr
Expand Down Expand Up @@ -1222,25 +1223,6 @@ class or instance) that acts as the specification for the mock object. If
"""


def _dot_lookup(thing, comp, import_path):
try:
return getattr(thing, comp)
except AttributeError:
__import__(import_path)
return getattr(thing, comp)


def _importer(target):
components = target.split('.')
import_path = components.pop(0)
thing = __import__(import_path)

for comp in components:
import_path += ".%s" % comp
thing = _dot_lookup(thing, comp, import_path)
return thing


def _is_started(patcher):
# XXXX horrible
return hasattr(patcher, 'is_local')
Expand Down Expand Up @@ -1583,8 +1565,7 @@ def _get_target(target):
except (TypeError, ValueError):
raise TypeError("Need a valid target to patch. You supplied: %r" %
(target,))
getter = lambda: _importer(target)
return getter, attribute
return partial(pkgutil.resolve_name, target), attribute
Copy link
Member

@FFY00 FFY00 May 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any reason here to be using functools.partial over lambda?

Copy link
Contributor Author

@graingert graingert Jul 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for consistency. lambda: is used twice in this file whereas partial( is used six times



def _patch_object(
Expand Down Expand Up @@ -1639,7 +1620,7 @@ def _patch_multiple(target, spec=None, create=False, spec_set=None,
for choosing which methods to wrap.
"""
if type(target) is str:
getter = lambda: _importer(target)
getter = partial(pkgutil.resolve_name, target)
else:
getter = lambda: target

Expand Down Expand Up @@ -1815,7 +1796,7 @@ def __enter__(self):
def _patch_dict(self):
values = self.values
if isinstance(self.in_dict, str):
self.in_dict = _importer(self.in_dict)
self.in_dict = pkgutil.resolve_name(self.in_dict)
in_dict = self.in_dict
clear = self.clear

Expand Down