diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-07-20 11:53:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 11:53:29 -0400 |
| commit | d5f38148ef994724811fea55d4c6dc392f97b429 (patch) | |
| tree | 75133a283a02cba07c37ccb76a7134acd744a591 /setuptools | |
| parent | 39374cb5747b8cc18240f474d10d17913f203b67 (diff) | |
| parent | 01de794bc829cc9eb0c1512b3570acec970e1acf (diff) | |
| download | python-setuptools-git-d5f38148ef994724811fea55d4c6dc392f97b429.tar.gz | |
Merge pull request #655 from stepshal/imorts_in_same_block
Put imports in same block alphabeticaly.
Diffstat (limited to 'setuptools')
| -rwxr-xr-x | setuptools/archive_util.py | 2 | ||||
| -rw-r--r-- | setuptools/command/bdist_egg.py | 2 | ||||
| -rw-r--r-- | setuptools/depends.py | 2 | ||||
| -rw-r--r-- | setuptools/tests/test_easy_install.py | 2 | ||||
| -rw-r--r-- | setuptools/tests/test_packageindex.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py index d1950638..3b41db15 100755 --- a/setuptools/archive_util.py +++ b/setuptools/archive_util.py @@ -12,8 +12,8 @@ import os import shutil import posixpath import contextlib -from pkg_resources import ensure_directory, ContextualZipFile from distutils.errors import DistutilsError +from pkg_resources import ensure_directory, ContextualZipFile class UnrecognizedFormat(DistutilsError): diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py index 9cebd7fa..c40022a1 100644 --- a/setuptools/command/bdist_egg.py +++ b/setuptools/command/bdist_egg.py @@ -8,8 +8,8 @@ from distutils import log from types import CodeType import sys import os -import marshal import textwrap +import marshal from setuptools.extern import six diff --git a/setuptools/depends.py b/setuptools/depends.py index 01f4a23a..48c20156 100644 --- a/setuptools/depends.py +++ b/setuptools/depends.py @@ -1,8 +1,8 @@ import sys import imp import marshal -from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN from distutils.version import StrictVersion +from imp import PKG_DIRECTORY, PY_COMPILED, PY_SOURCE, PY_FROZEN from setuptools.extern import six diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index 821e6fb2..aa905f5a 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -15,8 +15,8 @@ import itertools import distutils.errors import io -from setuptools.extern.six.moves import urllib import time +from setuptools.extern.six.moves import urllib import pytest try: diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py index b2b0d537..f9bf895b 100644 --- a/setuptools/tests/test_packageindex.py +++ b/setuptools/tests/test_packageindex.py @@ -7,10 +7,10 @@ import distutils.errors from setuptools.extern import six from setuptools.extern.six.moves import urllib, http_client -from .textwrap import DALS import pkg_resources import setuptools.package_index from setuptools.tests.server import IndexServer +from .textwrap import DALS class TestPackageIndex: |