aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/__init__.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-09-02 14:01:55 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-09-02 14:01:55 -0400
commit26ea618c278baa8ea77bf3f81f8abf5e3c1cf416 (patch)
tree118259c118904a8bdfea873c635b114e4a986208 /setuptools/__init__.py
parent053ed7e2f6885b001a85fc0a8759f2226a2f178a (diff)
downloadexternal_python_setuptools-26ea618c278baa8ea77bf3f81f8abf5e3c1cf416.tar.gz
external_python_setuptools-26ea618c278baa8ea77bf3f81f8abf5e3c1cf416.tar.bz2
external_python_setuptools-26ea618c278baa8ea77bf3f81f8abf5e3c1cf416.zip
Move imports to leader
Diffstat (limited to 'setuptools/__init__.py')
-rw-r--r--setuptools/__init__.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 2eb51a1f..820f7f55 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -3,6 +3,7 @@
import os
import sys
import distutils.core
+import distutils.filelist
from distutils.core import Command as _Command
from distutils.util import convert_path
@@ -44,11 +45,11 @@ def find_packages(where='.', exclude=()):
looks_like_package = (
'.' not in name
and os.path.isdir(fn)
- and os.path.isfile(os.path.join(fn,'__init__.py'))
+ and os.path.isfile(os.path.join(fn, '__init__.py'))
)
if looks_like_package:
out.append(prefix+name)
- stack.append((fn,prefix+name+'.'))
+ stack.append((fn, prefix+name+'.'))
for pat in list(exclude)+['ez_setup']:
from fnmatch import fnmatchcase
out = [item for item in out if not fnmatchcase(item,pat)]
@@ -75,7 +76,6 @@ class Command(_Command):
setattr(cmd,k,v) # update command with keywords
return cmd
-import distutils.core
distutils.core.Command = Command # we can't patch distutils.cmd, alas
def findall(dir = os.curdir):
@@ -91,7 +91,6 @@ def findall(dir = os.curdir):
all_files.extend(filter(os.path.isfile, files))
return all_files
-import distutils.filelist
distutils.filelist.findall = findall # fix findall bug in distutils.
# sys.dont_write_bytecode was introduced in Python 2.6.