diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2009-09-13 13:50:29 +0200 |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2009-09-13 13:50:29 +0200 |
commit | 1a8b650faf34b6205a8a26168ab7ef886833f85c (patch) | |
tree | d63a409d9f88c48aec82a1614862c811902cd2c9 /setuptools/command/build_py.py | |
parent | de9db4b432928776ed32c56c0338344abab9f4bf (diff) | |
download | external_python_setuptools-1a8b650faf34b6205a8a26168ab7ef886833f85c.tar.gz external_python_setuptools-1a8b650faf34b6205a8a26168ab7ef886833f85c.tar.bz2 external_python_setuptools-1a8b650faf34b6205a8a26168ab7ef886833f85c.zip |
Fix processing of convert_doctests_2to3.
--HG--
branch : distribute
extra : rebase_source : 101f51e5f7c364407e27b742aec5e02336936d8c
Diffstat (limited to 'setuptools/command/build_py.py')
-rw-r--r-- | setuptools/command/build_py.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py index dd99b9d6..2413b420 100644 --- a/setuptools/command/build_py.py +++ b/setuptools/command/build_py.py @@ -23,6 +23,9 @@ try: def run_2to3(self, files, doctests = False): if not setuptools.run_2to3: return + if not files: + return + log.info("Fixing "+" ".join(files)) if not self.fixer_names: self.fixer_names = [] for p in setuptools.lib2to3_fixer_packages: @@ -126,8 +129,10 @@ class build_py(_build_py, Mixin2to3): for filename in filenames: target = os.path.join(build_dir, filename) self.mkpath(os.path.dirname(target)) - outf, copied = self.copy_file(os.path.join(src_dir, filename), target) - if copied and filename in setuptools.convert_doctests_2to3: + srcfile = os.path.join(src_dir, filename) + outf, copied = self.copy_file(srcfile, target) + srcfile = os.path.abspath(srcfile) + if copied and srcfile in self.distribution.convert_doctests_2to3: self.__doctests_2to3.append(outf) |