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/config.py | |
parent | 4eb5b32f8d8bb1e20907028a516346e2b1901391 (diff) | |
download | python-setuptools-git-fb7ab81a3d080422687bad71f9ae9d36eeefbee2.tar.gz |
Remove Python 2 compatibility
Diffstat (limited to 'setuptools/config.py')
-rw-r--r-- | setuptools/config.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/setuptools/config.py b/setuptools/config.py index a8f8b6b0..af3a3bcb 100644 --- a/setuptools/config.py +++ b/setuptools/config.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, unicode_literals import ast import io import os @@ -15,10 +14,6 @@ import contextlib from distutils.errors import DistutilsOptionError, DistutilsFileError from setuptools.extern.packaging.version import LegacyVersion, parse from setuptools.extern.packaging.specifiers import SpecifierSet -from setuptools.extern.six import string_types, PY3 - - -__metaclass__ = type class StaticModule: @@ -324,7 +319,7 @@ class ConfigHandler: """ include_directive = 'file:' - if not isinstance(value, string_types): + if not isinstance(value, str): return value if not value.startswith(include_directive): @@ -559,7 +554,7 @@ class ConfigMetadataHandler(ConfigHandler): if callable(version): version = version() - if not isinstance(version, string_types): + if not isinstance(version, str): if hasattr(version, '__iter__'): version = '.'.join(map(str, version)) else: @@ -614,9 +609,6 @@ class ConfigOptionsHandler(ConfigHandler): return self._parse_list(value) findns = trimmed_value == find_directives[1] - if findns and not PY3: - raise DistutilsOptionError( - 'find_namespace: directive is unsupported on Python < 3.3') # Read function arguments from a dedicated section. find_kwargs = self.parse_section_packages__find( |