Commit 80a28fa8 authored by Jason R. Coombs's avatar Jason R. Coombs

Use underlying invocation of ._load directly

parent a8cc5bd6
...@@ -172,4 +172,4 @@ class test(Command): ...@@ -172,4 +172,4 @@ class test(Command):
if val is None: if val is None:
return return
parsed = EntryPoint.parse("x=" + val) parsed = EntryPoint.parse("x=" + val)
return parsed.load(require=False)() return parsed._load()()
...@@ -434,7 +434,8 @@ class Distribution(_Distribution): ...@@ -434,7 +434,8 @@ class Distribution(_Distribution):
def print_commands(self): def print_commands(self):
for ep in pkg_resources.iter_entry_points('distutils.commands'): for ep in pkg_resources.iter_entry_points('distutils.commands'):
if ep.name not in self.cmdclass: 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 self.cmdclass[ep.name] = cmdclass
return _Distribution.print_commands(self) return _Distribution.print_commands(self)
......
...@@ -430,7 +430,7 @@ def test_default_revctrl(): ...@@ -430,7 +430,7 @@ def test_default_revctrl():
""" """
ep_def = 'svn_cvs = setuptools.command.sdist:_default_revctrl' ep_def = 'svn_cvs = setuptools.command.sdist:_default_revctrl'
ep = pkg_resources.EntryPoint.parse(ep_def) ep = pkg_resources.EntryPoint.parse(ep_def)
res = ep.load(require=False) res = ep._load()
assert hasattr(res, '__iter__') assert hasattr(res, '__iter__')
......
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