diff options
Diffstat (limited to 'setuptools')
40 files changed, 57 insertions, 53 deletions
diff --git a/setuptools/__init__.py b/setuptools/__init__.py index d01918ed..04f76740 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -7,7 +7,7 @@ import distutils.filelist from distutils.util import convert_path from fnmatch import fnmatchcase -from six.moves import filter, map +from setuptools.extern.six.moves import filter, map import setuptools.version from setuptools.extension import Extension diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py index 35ece78d..4532b1cc 100755 --- a/setuptools/command/alias.py +++ b/setuptools/command/alias.py @@ -1,6 +1,6 @@ from distutils.errors import DistutilsOptionError -from six.moves import map +from setuptools.extern.six.moves import map from setuptools.command.setopt import edit_config, option_base, config_file diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py index ae344cd0..8cd9dfef 100644 --- a/setuptools/command/bdist_egg.py +++ b/setuptools/command/bdist_egg.py @@ -11,7 +11,7 @@ import os import textwrap import marshal -import six +from setuptools.extern import six from pkg_resources import get_build_platform, Distribution, ensure_directory from pkg_resources import EntryPoint diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py index c2fd8704..36f53f0d 100644 --- a/setuptools/command/build_ext.py +++ b/setuptools/command/build_ext.py @@ -10,7 +10,7 @@ from distutils.errors import DistutilsError from distutils import log from setuptools.extension import Library -import six +from setuptools.extern import six try: # Attempt to use Cython for building extensions, if available diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py index 56daa2bd..b0314fd4 100644 --- a/setuptools/command/build_py.py +++ b/setuptools/command/build_py.py @@ -8,8 +8,8 @@ import io import distutils.errors import itertools -import six -from six.moves import map, filter, filterfalse +from setuptools.extern import six +from setuptools.extern.six.moves import map, filter, filterfalse try: from setuptools.lib2to3_ex import Mixin2to3 diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py index ddfdc662..85b23c60 100755 --- a/setuptools/command/develop.py +++ b/setuptools/command/develop.py @@ -5,7 +5,7 @@ import os import glob import io -import six +from setuptools.extern import six from pkg_resources import Distribution, PathMetadata, normalize_path from setuptools.command.easy_install import easy_install diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index d3eabfc3..36e7f359 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -40,8 +40,8 @@ import subprocess import shlex import io -import six -from six.moves import configparser, map +from setuptools.extern import six +from setuptools.extern.six.moves import configparser, map from setuptools import Command from setuptools.sandbox import run_setup diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index 1a6ea9cb..a32c42f8 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -16,8 +16,8 @@ import warnings import time import collections -import six -from six.moves import map +from setuptools.extern import six +from setuptools.extern.six.moves import map from setuptools import Command from setuptools.command.sdist import sdist @@ -30,7 +30,7 @@ from pkg_resources import ( import setuptools.unicode_utils as unicode_utils from setuptools.glob import glob -import packaging +from pkg_resources.extern import packaging def translate_pattern(glob): diff --git a/setuptools/command/py36compat.py b/setuptools/command/py36compat.py index a2c74b2d..61063e75 100644 --- a/setuptools/command/py36compat.py +++ b/setuptools/command/py36compat.py @@ -3,7 +3,7 @@ from glob import glob from distutils.util import convert_path from distutils.command import sdist -from six.moves import filter +from setuptools.extern.six.moves import filter class sdist_add_defaults: diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py index 7ea36e96..b89353f5 100755 --- a/setuptools/command/rotate.py +++ b/setuptools/command/rotate.py @@ -4,7 +4,7 @@ from distutils.errors import DistutilsOptionError import os import shutil -import six +from setuptools.extern import six from setuptools import Command diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py index 2c2d88af..84e29a1b 100755 --- a/setuptools/command/sdist.py +++ b/setuptools/command/sdist.py @@ -5,7 +5,7 @@ import sys import io import contextlib -import six +from setuptools.extern import six from .py36compat import sdist_add_defaults diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py index 6f6298c4..7e57cc02 100755 --- a/setuptools/command/setopt.py +++ b/setuptools/command/setopt.py @@ -4,7 +4,7 @@ from distutils.errors import DistutilsOptionError import distutils import os -from six.moves import configparser +from setuptools.extern.six.moves import configparser from setuptools import Command diff --git a/setuptools/command/test.py b/setuptools/command/test.py index e7a386d1..ef0af12f 100644 --- a/setuptools/command/test.py +++ b/setuptools/command/test.py @@ -7,8 +7,8 @@ from distutils.errors import DistutilsError, DistutilsOptionError from distutils import log from unittest import TestLoader -import six -from six.moves import map, filter +from setuptools.extern import six +from setuptools.extern.six.moves import map, filter from pkg_resources import (resource_listdir, resource_exists, normalize_path, working_set, _namespace_packages, diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py index eeb0718b..269dc2d5 100644 --- a/setuptools/command/upload_docs.py +++ b/setuptools/command/upload_docs.py @@ -16,8 +16,8 @@ import shutil import itertools import functools -import six -from six.moves import http_client, urllib +from setuptools.extern import six +from setuptools.extern.six.moves import http_client, urllib from pkg_resources import iter_entry_points from .upload import upload diff --git a/setuptools/config.py b/setuptools/config.py index 39a01f88..0149316c 100644 --- a/setuptools/config.py +++ b/setuptools/config.py @@ -7,7 +7,7 @@ from functools import partial from distutils.errors import DistutilsOptionError, DistutilsFileError from setuptools.py26compat import import_module -from six import string_types +from setuptools.extern.six import string_types def read_configuration( diff --git a/setuptools/dist.py b/setuptools/dist.py index be55dc4e..159464be 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -12,9 +12,9 @@ from distutils.errors import (DistutilsOptionError, DistutilsPlatformError, DistutilsSetupError) from distutils.util import rfc822_escape -import six -from six.moves import map -import packaging +from setuptools.extern import six +from setuptools.extern.six.moves import map +from pkg_resources.extern import packaging from setuptools.depends import Require from setuptools import windows_support diff --git a/setuptools/extension.py b/setuptools/extension.py index 34a36dfb..29468894 100644 --- a/setuptools/extension.py +++ b/setuptools/extension.py @@ -4,7 +4,7 @@ import distutils.core import distutils.errors import distutils.extension -from six.moves import map +from setuptools.extern.six.moves import map from .monkey import get_unpatched diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py new file mode 100644 index 00000000..2cd08b7e --- /dev/null +++ b/setuptools/extern/__init__.py @@ -0,0 +1,4 @@ +from pkg_resources.extern import VendorImporter + +names = 'six', +VendorImporter(__name__, names, 'pkg_resources._vendor').install() diff --git a/setuptools/glob.py b/setuptools/glob.py index f2644026..6c781de3 100644 --- a/setuptools/glob.py +++ b/setuptools/glob.py @@ -10,7 +10,7 @@ Changes include: import os import re import fnmatch -from six import binary_type +from setuptools.extern.six import binary_type __all__ = ["glob", "iglob", "escape"] diff --git a/setuptools/monkey.py b/setuptools/monkey.py index 68fad9dd..94f22a56 100644 --- a/setuptools/monkey.py +++ b/setuptools/monkey.py @@ -10,7 +10,7 @@ import functools import inspect from .py26compat import import_module -import six +from setuptools.extern import six import setuptools diff --git a/setuptools/msvc.py b/setuptools/msvc.py index 97e27303..447ddb38 100644 --- a/setuptools/msvc.py +++ b/setuptools/msvc.py @@ -20,14 +20,14 @@ import sys import platform import itertools import distutils.errors -from packaging.version import LegacyVersion +from pkg_resources.extern.packaging.version import LegacyVersion -from six.moves import filterfalse +from setuptools.extern.six.moves import filterfalse from .monkey import get_unpatched if platform.system() == 'Windows': - from six.moves import winreg + from setuptools.extern.six.moves import winreg safe_env = os.environ else: """ diff --git a/setuptools/namespaces.py b/setuptools/namespaces.py index 7c24a566..dc16106d 100755 --- a/setuptools/namespaces.py +++ b/setuptools/namespaces.py @@ -2,7 +2,7 @@ import os from distutils import log import itertools -from six.moves import map +from setuptools.extern.six.moves import map flatten = itertools.chain.from_iterable diff --git a/setuptools/package_index.py b/setuptools/package_index.py index 3544dd54..faef5377 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -14,8 +14,8 @@ try: except ImportError: from urllib2 import splituser -import six -from six.moves import urllib, http_client, configparser, map +from setuptools.extern import six +from setuptools.extern.six.moves import urllib, http_client, configparser, map import setuptools from pkg_resources import ( diff --git a/setuptools/py33compat.py b/setuptools/py33compat.py index 0caa2003..af64d5d1 100644 --- a/setuptools/py33compat.py +++ b/setuptools/py33compat.py @@ -2,7 +2,7 @@ import dis import array import collections -import six +from setuptools.extern import six OpArg = collections.namedtuple('OpArg', 'opcode arg') diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py index 0ddd2332..817a3afa 100755 --- a/setuptools/sandbox.py +++ b/setuptools/sandbox.py @@ -8,8 +8,8 @@ import re import contextlib import pickle -import six -from six.moves import builtins, map +from setuptools.extern import six +from setuptools.extern.six.moves import builtins, map import pkg_resources diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py index fa5e4421..72b18ef2 100644 --- a/setuptools/ssl_support.py +++ b/setuptools/ssl_support.py @@ -4,7 +4,7 @@ import atexit import re import functools -from six.moves import urllib, http_client, map, filter +from setuptools.extern.six.moves import urllib, http_client, map, filter from pkg_resources import ResolutionError, ExtractionError diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py index f54c478e..dbf16201 100644 --- a/setuptools/tests/__init__.py +++ b/setuptools/tests/__init__.py @@ -8,7 +8,7 @@ from distutils.errors import DistutilsSetupError from distutils.core import Extension from distutils.version import LooseVersion -import six +from setuptools.extern import six import pytest import setuptools.dist diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py index 77ebecf9..535ae107 100644 --- a/setuptools/tests/contexts.py +++ b/setuptools/tests/contexts.py @@ -5,7 +5,7 @@ import sys import contextlib import site -import six +from setuptools.extern import six import pkg_resources diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py index 5cdde217..35312120 100644 --- a/setuptools/tests/server.py +++ b/setuptools/tests/server.py @@ -4,7 +4,7 @@ import time import threading -from six.moves import BaseHTTPServer, SimpleHTTPServer +from setuptools.extern.six.moves import BaseHTTPServer, SimpleHTTPServer class IndexServer(BaseHTTPServer.HTTPServer): diff --git a/setuptools/tests/test_archive_util.py b/setuptools/tests/test_archive_util.py index 5cdf63f2..b789e9ac 100644 --- a/setuptools/tests/test_archive_util.py +++ b/setuptools/tests/test_archive_util.py @@ -3,7 +3,7 @@ import tarfile import io -import six +from setuptools.extern import six import pytest diff --git a/setuptools/tests/test_build_ext.py b/setuptools/tests/test_build_ext.py index 59a896d8..60257154 100644 --- a/setuptools/tests/test_build_ext.py +++ b/setuptools/tests/test_build_ext.py @@ -2,7 +2,7 @@ import sys import distutils.command.build_ext as orig from distutils.sysconfig import get_config_var -import six +from setuptools.extern import six from setuptools.command.build_ext import build_ext, get_abi3_suffix from setuptools.dist import Distribution diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py index 54e199c3..ad7cfa05 100644 --- a/setuptools/tests/test_develop.py +++ b/setuptools/tests/test_develop.py @@ -9,7 +9,7 @@ import sys import io import subprocess -import six +from setuptools.extern import six from setuptools.command import test import pytest diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py index 24c5149a..f7e7d2bf 100644 --- a/setuptools/tests/test_dist_info.py +++ b/setuptools/tests/test_dist_info.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals -from six.moves import map +from setuptools.extern.six.moves import map import pytest diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index b75e6ff2..52db16f6 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -17,7 +17,7 @@ import zipfile from unittest import mock import time -from six.moves import urllib +from setuptools.extern.six.moves import urllib import pytest diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py index c9a4425a..a32b981d 100644 --- a/setuptools/tests/test_egg_info.py +++ b/setuptools/tests/test_egg_info.py @@ -6,7 +6,7 @@ import sys from setuptools.command.egg_info import egg_info, manifest_maker from setuptools.dist import Distribution -from six.moves import map +from setuptools.extern.six.moves import map import pytest diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py index a83d4fe8..78fb0627 100644 --- a/setuptools/tests/test_integration.py +++ b/setuptools/tests/test_integration.py @@ -7,7 +7,7 @@ import glob import os import sys -from six.moves import urllib +from setuptools.extern.six.moves import urllib import pytest from setuptools.command.easy_install import easy_install diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py index 3b34c888..f17cf6a6 100644 --- a/setuptools/tests/test_manifest.py +++ b/setuptools/tests/test_manifest.py @@ -11,7 +11,7 @@ from distutils.errors import DistutilsTemplateError from setuptools.command.egg_info import FileList, egg_info, translate_pattern from setuptools.dist import Distribution -import six +from setuptools.extern import six from setuptools.tests.textwrap import DALS import pytest diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py index 1a66394f..53e20d44 100644 --- a/setuptools/tests/test_packageindex.py +++ b/setuptools/tests/test_packageindex.py @@ -4,8 +4,8 @@ import sys import os import distutils.errors -import six -from six.moves import urllib, http_client +from setuptools.extern import six +from setuptools.extern.six.moves import urllib, http_client import pkg_resources import setuptools.package_index diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py index 38fdda24..f34068dc 100644 --- a/setuptools/tests/test_sdist.py +++ b/setuptools/tests/test_sdist.py @@ -9,8 +9,8 @@ import unicodedata import contextlib import io -import six -from six.moves import map +from setuptools.extern import six +from setuptools.extern.six.moves import map import pytest diff --git a/setuptools/unicode_utils.py b/setuptools/unicode_utils.py index 6a84f9be..7c63efd2 100644 --- a/setuptools/unicode_utils.py +++ b/setuptools/unicode_utils.py @@ -1,7 +1,7 @@ import unicodedata import sys -import six +from setuptools.extern import six # HFS Plus uses decomposed UTF-8 |