From 952c1bafda1929c74c737646aa025e6ffad6632e Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 31 Dec 2015 16:30:47 -0500 Subject: Modeling after Astropy's technique for bundling libraries, the imports are now much cleaner. Thanks @embray. Ref #229. --HG-- branch : feature/issue-229 --- setuptools/command/bdist_egg.py | 7 +------ setuptools/command/develop.py | 7 +------ setuptools/command/easy_install.py | 10 ++-------- setuptools/command/egg_info.py | 7 +------ setuptools/command/rotate.py | 7 +------ setuptools/command/sdist.py | 7 +------ setuptools/command/setopt.py | 7 +------ setuptools/command/test.py | 7 +------ setuptools/command/upload_docs.py | 10 ++-------- 9 files changed, 11 insertions(+), 58 deletions(-) (limited to 'setuptools/command') diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py index 78164819..9cebd7fa 100644 --- a/setuptools/command/bdist_egg.py +++ b/setuptools/command/bdist_egg.py @@ -11,12 +11,7 @@ import os import marshal import textwrap -try: - from setuptools._vendor import six -except ImportError: - # fallback to naturally-installed version; allows system packagers to - # omit vendored packages. - 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/develop.py b/setuptools/command/develop.py index c401c8d4..11b5df10 100755 --- a/setuptools/command/develop.py +++ b/setuptools/command/develop.py @@ -5,12 +5,7 @@ import os import glob import io -try: - from setuptools._vendor import six -except ImportError: - # fallback to naturally-installed version; allows system packagers to - # omit vendored packages. - 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 51c38ddf..a11618d1 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -40,14 +40,8 @@ import subprocess import shlex import io -try: - from setuptools._vendor import six - from setuptools._vendor.six.moves import configparser -except ImportError: - # fallback to naturally-installed version; allows system packagers to - # omit vendored packages. - import six - from six.moves import configparser +from setuptools.extern import six +from setuptools.extern.six.moves import configparser 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 5b996a11..cf46d24a 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -14,12 +14,7 @@ import io import warnings import time -try: - from setuptools._vendor import six -except ImportError: - # fallback to naturally-installed version; allows system packagers to - # omit vendored packages. - import six +from setuptools.extern import six from setuptools import Command from setuptools.command.sdist import sdist diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py index 1ee1c538..804f962a 100755 --- a/setuptools/command/rotate.py +++ b/setuptools/command/rotate.py @@ -3,12 +3,7 @@ from distutils import log from distutils.errors import DistutilsOptionError import os -try: - from setuptools._vendor import six -except ImportError: - # fallback to naturally-installed version; allows system packagers to - # omit vendored packages. - import six +from setuptools.extern import six from setuptools import Command diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py index 59990cd6..6640d4e3 100755 --- a/setuptools/command/sdist.py +++ b/setuptools/command/sdist.py @@ -5,12 +5,7 @@ import os import sys import io -try: - from setuptools._vendor import six -except ImportError: - # fallback to naturally-installed version; allows system packagers to - # omit vendored packages. - import six +from setuptools.extern import six from setuptools.utils import cs_path_exists diff --git a/setuptools/command/setopt.py b/setuptools/command/setopt.py index 1441e512..7f332be5 100755 --- a/setuptools/command/setopt.py +++ b/setuptools/command/setopt.py @@ -4,12 +4,7 @@ from distutils.errors import DistutilsOptionError import distutils import os -try: - from setuptools._vendor.six.moves import configparser -except ImportError: - # fallback to naturally-installed version; allows system packagers to - # omit vendored packages. - 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 32ff7f15..3a2a9b93 100644 --- a/setuptools/command/test.py +++ b/setuptools/command/test.py @@ -2,12 +2,7 @@ from distutils.errors import DistutilsOptionError from unittest import TestLoader import sys -try: - from setuptools._vendor import six -except ImportError: - # fallback to naturally-installed version; allows system packagers to - # omit vendored packages. - import six +from setuptools.extern import six 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 60e9fb7e..ca35a3ce 100644 --- a/setuptools/command/upload_docs.py +++ b/setuptools/command/upload_docs.py @@ -16,14 +16,8 @@ import tempfile import sys import shutil -try: - from setuptools._vendor import six - from setuptools._vendor.six.moves import http_client, urllib -except ImportError: - # fallback to naturally-installed version; allows system packagers to - # omit vendored packages. - 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 -- cgit v1.2.3