aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstepshal <nessento@openmailbox.org>2016-07-14 21:45:22 +0700
committerstepshal <nessento@openmailbox.org>2016-07-14 21:45:22 +0700
commit01de794bc829cc9eb0c1512b3570acec970e1acf (patch)
tree35d0e3cdfa8efd0c59c7612d1511ec3e976abb73
parent8e80ee745b620086bea2111236f85fa2376d748f (diff)
downloadexternal_python_setuptools-01de794bc829cc9eb0c1512b3570acec970e1acf.tar.gz
external_python_setuptools-01de794bc829cc9eb0c1512b3570acec970e1acf.tar.bz2
external_python_setuptools-01de794bc829cc9eb0c1512b3570acec970e1acf.zip
Put imports in same block alphabeticaly.
-rwxr-xr-xsetuptools/archive_util.py2
-rw-r--r--setuptools/command/bdist_egg.py2
-rw-r--r--setuptools/depends.py2
-rw-r--r--setuptools/tests/test_easy_install.py2
-rw-r--r--setuptools/tests/test_packageindex.py2
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 eb1d7b13..865d4151 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 894c4fd8..94b25f2e 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 61f5909b..877f3049 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: