Corrected reference to msvccompiler in the 'from' statement

replaced reference from dir_util to _backport.shutil
replaced reference from remove_tree to rmtree

2 files changed, 6 insertions, 3 deletions

diff --git a/distutils2/command/bdist_msi.py b/distutils2/command/bdist_msi.py
index 61968ad..f947c1a 100644
--- a/distutils2/command/bdist_msi.py
+++ b/distutils2/command/bdist_msi.py
@@ -10,11 +10,11 @@ import sys, os
 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 @@ class bdist_msi (Command):
             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
index 405c594..bb63596 100644
--- a/distutils2/command/build_ext.py
+++ b/distutils2/command/build_ext.py
@@ -31,7 +31,7 @@ else:
     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.