diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-31 12:35:32 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-31 12:35:32 -0500 |
| commit | 80a28fa8c044ccb74e4ae54544be8c449ebd03e8 (patch) | |
| tree | a0e8f9a1fa48704f535b5597461dfc4c381d1035 | |
| parent | a8cc5bd6104fe69756ae188e1482eedd5840d34b (diff) | |
| download | external_python_setuptools-80a28fa8c044ccb74e4ae54544be8c449ebd03e8.tar.gz external_python_setuptools-80a28fa8c044ccb74e4ae54544be8c449ebd03e8.tar.bz2 external_python_setuptools-80a28fa8c044ccb74e4ae54544be8c449ebd03e8.zip | |
Use underlying invocation of ._load directly
| -rw-r--r-- | setuptools/command/test.py | 2 | ||||
| -rw-r--r-- | setuptools/dist.py | 3 | ||||
| -rw-r--r-- | setuptools/tests/test_sdist.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/setuptools/command/test.py b/setuptools/command/test.py index 1038da71..2bf5cb16 100644 --- a/setuptools/command/test.py +++ b/setuptools/command/test.py @@ -172,4 +172,4 @@ class test(Command): if val is None: return parsed = EntryPoint.parse("x=" + val) - return parsed.load(require=False)() + return parsed._load()() diff --git a/setuptools/dist.py b/setuptools/dist.py index 7a94d4b3..eb146444 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -434,7 +434,8 @@ class Distribution(_Distribution): def print_commands(self): for ep in pkg_resources.iter_entry_points('distutils.commands'): if ep.name not in self.cmdclass: - cmdclass = ep.load(False) # don't require extras, we're not running + # don't require extras as the commands won't be invoked + cmdclass = ep._load() self.cmdclass[ep.name] = cmdclass return _Distribution.print_commands(self) diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py index 090e7304..123e3ea9 100644 --- a/setuptools/tests/test_sdist.py +++ b/setuptools/tests/test_sdist.py @@ -430,7 +430,7 @@ def test_default_revctrl(): """ ep_def = 'svn_cvs = setuptools.command.sdist:_default_revctrl' ep = pkg_resources.EntryPoint.parse(ep_def) - res = ep.load(require=False) + res = ep._load() assert hasattr(res, '__iter__') |