diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-10-17 16:34:23 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-10-17 16:34:23 -0400 |
| commit | 419087c45b105579f69d8bc729c1aa09eb493c17 (patch) | |
| tree | 88b2c194a60164aa460b378323b450423a7e88ee /setuptools/command/build_py.py | |
| parent | 38de858e37f9c7a90498ea78c78ed76aca835ad2 (diff) | |
| parent | 898ae04656066d88add9c0a8750f32f938d99716 (diff) | |
| download | python-setuptools-git-419087c45b105579f69d8bc729c1aa09eb493c17.tar.gz | |
Merge branch 'master' into debt/drop-py35
Diffstat (limited to 'setuptools/command/build_py.py')
| -rw-r--r-- | setuptools/command/build_py.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py index 9d0288a5..b30aa129 100644 --- a/setuptools/command/build_py.py +++ b/setuptools/command/build_py.py @@ -9,12 +9,9 @@ import distutils.errors import itertools import stat -from setuptools.extern import six -from setuptools.extern.six.moves import map, filter, filterfalse - try: from setuptools.lib2to3_ex import Mixin2to3 -except ImportError: +except Exception: class Mixin2to3: def run_2to3(self, files, doctests=True): @@ -73,9 +70,6 @@ class build_py(orig.build_py, Mixin2to3): return orig.build_py.__getattr__(self, attr) def build_module(self, module, module_file, package): - if six.PY2 and isinstance(package, six.string_types): - # avoid errors on Python 2 when unicode is passed (#190) - package = package.split('.') outfile, copied = orig.build_py.build_module(self, module, module_file, package) if copied: @@ -249,7 +243,7 @@ def _unique_everseen(iterable, key=None): seen = set() seen_add = seen.add if key is None: - for element in filterfalse(seen.__contains__, iterable): + for element in itertools.filterfalse(seen.__contains__, iterable): seen_add(element) yield element else: |