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/tests | |
| parent | 39374cb5747b8cc18240f474d10d17913f203b67 (diff) | |
| parent | 01de794bc829cc9eb0c1512b3570acec970e1acf (diff) | |
| download | external_python_setuptools-d5f38148ef994724811fea55d4c6dc392f97b429.tar.gz external_python_setuptools-d5f38148ef994724811fea55d4c6dc392f97b429.tar.bz2 external_python_setuptools-d5f38148ef994724811fea55d4c6dc392f97b429.zip | |
Merge pull request #655 from stepshal/imorts_in_same_block
Put imports in same block alphabeticaly.
Diffstat (limited to 'setuptools/tests')
| -rw-r--r-- | setuptools/tests/test_easy_install.py | 2 | ||||
| -rw-r--r-- | setuptools/tests/test_packageindex.py | 2 |
2 files changed, 2 insertions, 2 deletions
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: |