[Python-checkins] distutils2: Fix two NameErrors (#11057)

[tarek.ziade]

tarek.ziade pushed 801c90825cc1 to distutils2:

http://hg.python.org/distutils2/rev/801c90825cc1
changeset:   941:801c90825cc1
parent:      927:11f13263c188
user:        ?ric Araujo <merwok at netwok.org>
date:        Sat Jan 29 17:06:35 2011 +0100
summary:
  Fix two NameErrors (#11057)

files:
  distutils2/command/build_py.py
  distutils2/config.py

diff --git a/distutils2/command/build_py.py b/distutils2/command/build_py.py
--- a/distutils2/command/build_py.py
+++ b/distutils2/command/build_py.py
@@ -8,7 +8,6 @@
 import logging
 from glob import glob
 
-import distutils2
 from distutils2.command.cmd import Command
 from distutils2.errors import DistutilsOptionError, DistutilsFileError
 from distutils2.util import convert_path
@@ -163,11 +162,13 @@
 
         Helper function for `run()`.
         """
+        # FIXME add tests for this method
         for package, src_dir, build_dir, filenames in self.data_files:
             for filename in filenames:
                 target = os.path.join(build_dir, filename)
+                srcfile = os.path.join(src_dir, filename)
                 self.mkpath(os.path.dirname(target))
-                outf, copied = self.copy_file(os.path.join(src_dir, filename),
+                outf, copied = self.copy_file(srcfile,
                                target, preserve_mode=False)
                 if copied and srcfile in self.distribution.convert_2to3.doctests:
                     self._doctests_2to3.append(outf)
diff --git a/distutils2/config.py b/distutils2/config.py
--- a/distutils2/config.py
+++ b/distutils2/config.py
@@ -7,7 +7,8 @@
 from ConfigParser import RawConfigParser
 
 from distutils2 import logger
-from distutils2.util import check_environ, resolve_name
+from distutils2.errors import DistutilsOptionError
+from distutils2.util import check_environ, resolve_name, strtobool
 from distutils2.compiler import set_compiler
 from distutils2.command import set_command
 

--
Repository URL: http://hg.python.org/distutils2