diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2021-07-04 22:35:04 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2021-07-04 22:35:04 -0400 |
| commit | 3a96d101b6ab32af7e256d854fc70cd31e551cfd (patch) | |
| tree | d28b92d0a15b7338f0c39d58eb63765ee38a0673 /setuptools/_distutils/command | |
| parent | 0aa3576ae23fd88d450e41931a6703e8eb96e9c4 (diff) | |
| parent | e2627b7327f6dc09946eeac897113178f88ece6c (diff) | |
| download | python-setuptools-git-3a96d101b6ab32af7e256d854fc70cd31e551cfd.tar.gz | |
Merge https://github.com/pypa/distutils into feature/distutils-sync
Diffstat (limited to 'setuptools/_distutils/command')
| -rw-r--r-- | setuptools/_distutils/command/build.py | 2 | ||||
| -rw-r--r-- | setuptools/_distutils/command/build_ext.py | 8 | ||||
| -rw-r--r-- | setuptools/_distutils/command/install.py | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/setuptools/_distutils/command/build.py b/setuptools/_distutils/command/build.py index a86df0bc..4355a632 100644 --- a/setuptools/_distutils/command/build.py +++ b/setuptools/_distutils/command/build.py @@ -102,7 +102,7 @@ class build(Command): # particular module distribution -- if user didn't supply it, pick # one of 'build_purelib' or 'build_platlib'. if self.build_lib is None: - if self.distribution.ext_modules: + if self.distribution.has_ext_modules(): self.build_lib = self.build_platlib else: self.build_lib = self.build_purelib diff --git a/setuptools/_distutils/command/build_ext.py b/setuptools/_distutils/command/build_ext.py index bbb34833..f7ab32cf 100644 --- a/setuptools/_distutils/command/build_ext.py +++ b/setuptools/_distutils/command/build_ext.py @@ -690,13 +690,15 @@ class build_ext(Command): provided, "PyInit_" + module_name. Only relevant on Windows, where the .pyd file (DLL) must export the module "PyInit_" function. """ - suffix = '_' + ext.name.split('.')[-1] + name = ext.name.split('.')[-1] try: # Unicode module name support as defined in PEP-489 # https://www.python.org/dev/peps/pep-0489/#export-hook-name - suffix.encode('ascii') + name.encode('ascii') except UnicodeEncodeError: - suffix = 'U' + suffix.encode('punycode').replace(b'-', b'_').decode('ascii') + suffix = 'U_' + name.encode('punycode').replace(b'-', b'_').decode('ascii') + else: + suffix = "_" + name initfunc_name = "PyInit" + suffix if initfunc_name not in ext.export_symbols: diff --git a/setuptools/_distutils/command/install.py b/setuptools/_distutils/command/install.py index 13feeb89..400fb45d 100644 --- a/setuptools/_distutils/command/install.py +++ b/setuptools/_distutils/command/install.py @@ -348,7 +348,7 @@ class install(Command): # module distribution is pure or not. Of course, if the user # already specified install_lib, use their selection. if self.install_lib is None: - if self.distribution.ext_modules: # has extensions: non-pure + if self.distribution.has_ext_modules(): # has extensions: non-pure self.install_lib = self.install_platlib else: self.install_lib = self.install_purelib |