[Python-checkins] distutils2: Corrected reference to msvccompiler in the 'from' statement

[tarek.ziade]

tarek.ziade pushed daf17ae62195 to distutils2:

http://hg.python.org/distutils2/rev/daf17ae62195
changeset:   706:daf17ae62195
parent:      700:fc571d152df0
user:        Rajiv Abraham <rajiv.abraham at gmail.com>
date:        Wed Sep 29 22:37:51 2010 -0400
summary:     Corrected reference to msvccompiler in the 'from' statement
files:       distutils2/command/bdist_msi.py, distutils2/command/build_ext.py, distutils2/compiler/msvccompiler.py

diff --git a/distutils2/command/bdist_msi.py b/distutils2/command/bdist_msi.py
--- a/distutils2/command/bdist_msi.py
+++ b/distutils2/command/bdist_msi.py
@@ -10,11 +10,11 @@
 from sysconfig import get_python_version
 
 from distutils2.core import Command
-from distutils2.dir_util import remove_tree
 from distutils2.version import StrictVersion
 from distutils2.errors import DistutilsOptionError
 from distutils2 import log
 from distutils2.util import get_platform
+from distutils2._backport.shutil import rmtree
 
 import msilib
 from msilib import schema, sequence, text
@@ -259,7 +259,10 @@
             self.distribution.dist_files.append(tup)
 
         if not self.keep_temp:
-            remove_tree(self.bdist_dir, dry_run=self.dry_run)
+            if self.dry_run:
+                pass # XXX
+            else:
+                rmtree(self.bdist_dir)
 
     def add_files(self):
         db = self.db
diff --git a/distutils2/command/build_ext.py b/distutils2/command/build_ext.py
--- a/distutils2/command/build_ext.py
+++ b/distutils2/command/build_ext.py
@@ -31,7 +31,7 @@
     HAS_USER_SITE = True
 
 if os.name == 'nt':
-    from distutils2.msvccompiler import get_build_version
+    from distutils2.compiler.msvccompiler import get_build_version
     MSVC_VERSION = int(get_build_version())
 
 # An extension name is just a dot-separated list of Python NAMEs (ie.
diff --git a/distutils2/compiler/msvccompiler.py b/distutils2/compiler/msvccompiler.py
--- a/distutils2/compiler/msvccompiler.py
+++ b/distutils2/compiler/msvccompiler.py
@@ -654,6 +654,6 @@
 if get_build_version() >= 8.0:
     log.debug("Importing new compiler from distutils.msvc9compiler")
     OldMSVCCompiler = MSVCCompiler
-    from distutils2.msvc9compiler import MSVCCompiler
+    from distutils2.compiler.msvc9compiler import MSVCCompiler
     # get_build_architecture not really relevant now we support cross-compile
-    from distutils2.msvc9compiler import MacroExpander
+    from distutils2.compiler.msvc9compiler import MacroExpander

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