diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-08-16 00:29:24 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-08-16 07:15:18 -0400 |
| commit | fb7ab81a3d080422687bad71f9ae9d36eeefbee2 (patch) | |
| tree | d87a9f6fdf32ab64334e1eb8a695949a88a3b043 /setuptools/build_meta.py | |
| parent | 4eb5b32f8d8bb1e20907028a516346e2b1901391 (diff) | |
| download | python-setuptools-git-fb7ab81a3d080422687bad71f9ae9d36eeefbee2.tar.gz | |
Remove Python 2 compatibility
Diffstat (limited to 'setuptools/build_meta.py')
| -rw-r--r-- | setuptools/build_meta.py | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py index 37132187..b9e8a2b3 100644 --- a/setuptools/build_meta.py +++ b/setuptools/build_meta.py @@ -32,10 +32,10 @@ import sys import tokenize import shutil import contextlib +import tempfile import setuptools import distutils -from setuptools.py31compat import TemporaryDirectory from pkg_resources import parse_requirements @@ -91,19 +91,6 @@ def no_install_setup_requires(): setuptools._install_setup_requires = orig -def _to_str(s): - """ - Convert a filename to a string (on Python 2, explicitly - a byte string, not Unicode) as distutils checks for the - exact type str. - """ - if sys.version_info[0] == 2 and not isinstance(s, str): - # Assume it's Unicode, as that's what the PEP says - # should be provided. - return s.encode(sys.getfilesystemencoding()) - return s - - def _get_immediate_subdirectories(a_dir): return [name for name in os.listdir(a_dir) if os.path.isdir(os.path.join(a_dir, name))] @@ -168,8 +155,8 @@ class _BuildMetaBackend(object): def prepare_metadata_for_build_wheel(self, metadata_directory, config_settings=None): - sys.argv = sys.argv[:1] + ['dist_info', '--egg-base', - _to_str(metadata_directory)] + sys.argv = sys.argv[:1] + [ + 'dist_info', '--egg-base', metadata_directory] with no_install_setup_requires(): self.run_setup() @@ -207,7 +194,7 @@ class _BuildMetaBackend(object): # Build in a temporary directory, then copy to the target. os.makedirs(result_directory, exist_ok=True) - with TemporaryDirectory(dir=result_directory) as tmp_dist_dir: + with tempfile.TemporaryDirectory(dir=result_directory) as tmp_dist_dir: sys.argv = (sys.argv[:1] + setup_command + ['--dist-dir', tmp_dist_dir] + config_settings["--global-option"]) |
