summaryrefslogtreecommitdiff
path: root/setuptools/command/build_py.py
diff options
context:
space:
mode:
authorMartin v. L?wis <martin@v.loewis.de>2009-09-13 00:36:04 +0200
committerMartin v. L?wis <martin@v.loewis.de>2009-09-13 00:36:04 +0200
commita77b42c3951b91a0f4a26616a4b58a906b32f36a (patch)
tree544c43ba5aabd29328075fabcf0f39922ca0c585 /setuptools/command/build_py.py
parentf2777ccce77b102e5fce583476992c4076e4e9fb (diff)
downloadpython-setuptools-bitbucket-a77b42c3951b91a0f4a26616a4b58a906b32f36a.tar.gz
Fix running 2to3.
Diffstat (limited to 'setuptools/command/build_py.py')
-rw-r--r--setuptools/command/build_py.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index a80572fd..d5890afe 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -6,6 +6,7 @@ from glob import glob
try:
from distutils.util import Mixin2to3 as _Mixin2to3
# add support for converting doctests that is missing in 3.1 distutils
+ from distutils import log
from lib2to3.refactor import RefactoringTool, get_fixers_from_package
import setuptools
class DistutilsRefactoringTool(RefactoringTool):
@@ -21,15 +22,14 @@ try:
class Mixin2to3(_Mixin2to3):
def run_2to3(self, files):
if not setuptools.run_2to3:
- return files
- files = _Mixin2to3.run_2to3(files)
+ return
+ _Mixin2to3.run_2to3(self, files)
if setuptools.run_2to3_on_doctests:
fixer_names = self.fixer_names
if fixer_names is None:
fixer_names = get_fixers_from_package('lib2to3.fixes')
r = DistutilsRefactoringTool(fixer_names)
r.refactor(files, write=True, doctests_only=True)
- return files
except ImportError:
class Mixin2to3: