diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2013-08-09 20:25:04 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-08-09 20:25:04 -0400 |
commit | 409327e443b73125a1a8803a5323a6dadbef7119 (patch) | |
tree | 443fb77a184d202ac61b70e2f620f5e0c2f69413 | |
parent | 82cff1a329896a88f3ee53a9303c295efc99206e (diff) | |
download | external_python_setuptools-409327e443b73125a1a8803a5323a6dadbef7119.tar.gz external_python_setuptools-409327e443b73125a1a8803a5323a6dadbef7119.tar.bz2 external_python_setuptools-409327e443b73125a1a8803a5323a6dadbef7119.zip |
Clean up imports
-rw-r--r-- | setuptools.egg-info/requires.txt | 14 | ||||
-rw-r--r-- | setuptools/tests/test_resources.py | 16 |
2 files changed, 20 insertions, 10 deletions
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt index 668f4ee2..e4fb4954 100644 --- a/setuptools.egg-info/requires.txt +++ b/setuptools.egg-info/requires.txt @@ -1,13 +1,13 @@ -[certs] -certifi==0.0.8 - -[ssl:python_version in '2.4, 2.5'] -ssl==1.16 - [ssl:sys_platform=='win32' and python_version=='2.4'] ctypes==1.0.2 [ssl:sys_platform=='win32'] -wincertstore==0.1
\ No newline at end of file +wincertstore==0.1 + +[certs] +certifi==0.0.8 + +[ssl:python_version in '2.4, 2.5'] +ssl==1.16
\ No newline at end of file diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py index df5261d1..949ebef4 100644 --- a/setuptools/tests/test_resources.py +++ b/setuptools/tests/test_resources.py @@ -1,11 +1,21 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # NOTE: the shebang and encoding lines are for ScriptHeaderTests; do not remove -from unittest import TestCase, makeSuite; from pkg_resources import * + +import os +import sys +import tempfile +import shutil +from unittest import TestCase + +import pkg_resources +from pkg_resources import * + from setuptools.command.easy_install import get_script_header, is_sh from setuptools.compat import StringIO, iteritems -import os, pkg_resources, sys, tempfile, shutil -try: frozenset + +try: + frozenset except NameError: from sets import ImmutableSet as frozenset |