diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-03-07 15:41:51 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-03-07 15:41:51 -0500 |
| commit | da94b05088d9bddb6ba0cd5a1b236e99985816c0 (patch) | |
| tree | 8a78ccd2d459e7702d914cb35e29f5f661e5bf5a /setuptools/__init__.py | |
| parent | 6980b9c8fed113f1046099924e16287662beff5f (diff) | |
| parent | 25edd1951d8d44c34578c926f5c20ed3d452587b (diff) | |
| download | external_python_setuptools-da94b05088d9bddb6ba0cd5a1b236e99985816c0.tar.gz external_python_setuptools-da94b05088d9bddb6ba0cd5a1b236e99985816c0.tar.bz2 external_python_setuptools-da94b05088d9bddb6ba0cd5a1b236e99985816c0.zip | |
Merge remote-tracking branch 'origin/master' into debt/remove-features
Diffstat (limited to 'setuptools/__init__.py')
| -rw-r--r-- | setuptools/__init__.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/setuptools/__init__.py b/setuptools/__init__.py index dc0f9893..4485852f 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -122,7 +122,7 @@ class PEP420PackageFinder(PackageFinder): find_packages = PackageFinder.find if PY3: - find_namespace_packages = PEP420PackageFinder.find + find_namespace_packages = PEP420PackageFinder.find def _install_setup_requires(attrs): @@ -143,6 +143,7 @@ def setup(**attrs): _install_setup_requires(attrs) return distutils.core.setup(**attrs) + setup.__doc__ = distutils.core.setup.__doc__ @@ -190,8 +191,8 @@ class Command(_Command): ok = False if not ok: raise DistutilsOptionError( - "'%s' must be a list of strings (got %r)" - % (option, val)) + "'%s' must be a list of strings (got %r)" + % (option, val)) def reinitialize_command(self, command, reinit_subcommands=0, **kw): cmd = _Command.reinitialize_command(self, command, reinit_subcommands) |