Commit 26ea618c authored by Jason R. Coombs's avatar Jason R. Coombs

Move imports to leader

parent 053ed7e2
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
import os import os
import sys import sys
import distutils.core import distutils.core
import distutils.filelist
from distutils.core import Command as _Command from distutils.core import Command as _Command
from distutils.util import convert_path from distutils.util import convert_path
...@@ -44,11 +45,11 @@ def find_packages(where='.', exclude=()): ...@@ -44,11 +45,11 @@ def find_packages(where='.', exclude=()):
looks_like_package = ( looks_like_package = (
'.' not in name '.' not in name
and os.path.isdir(fn) 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: if looks_like_package:
out.append(prefix+name) out.append(prefix+name)
stack.append((fn,prefix+name+'.')) stack.append((fn, prefix+name+'.'))
for pat in list(exclude)+['ez_setup']: for pat in list(exclude)+['ez_setup']:
from fnmatch import fnmatchcase from fnmatch import fnmatchcase
out = [item for item in out if not fnmatchcase(item,pat)] out = [item for item in out if not fnmatchcase(item,pat)]
...@@ -75,7 +76,6 @@ class Command(_Command): ...@@ -75,7 +76,6 @@ class Command(_Command):
setattr(cmd,k,v) # update command with keywords setattr(cmd,k,v) # update command with keywords
return cmd return cmd
import distutils.core
distutils.core.Command = Command # we can't patch distutils.cmd, alas distutils.core.Command = Command # we can't patch distutils.cmd, alas
def findall(dir = os.curdir): def findall(dir = os.curdir):
...@@ -91,7 +91,6 @@ def findall(dir = os.curdir): ...@@ -91,7 +91,6 @@ def findall(dir = os.curdir):
all_files.extend(filter(os.path.isfile, files)) all_files.extend(filter(os.path.isfile, files))
return all_files return all_files
import distutils.filelist
distutils.filelist.findall = findall # fix findall bug in distutils. distutils.filelist.findall = findall # fix findall bug in distutils.
# sys.dont_write_bytecode was introduced in Python 2.6. # sys.dont_write_bytecode was introduced in Python 2.6.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment