created a subpackage for compilers

5 files changed, 14 insertions, 14 deletions

diff --git a/src/distutils2/command/bdist_wininst.py b/src/distutils2/command/bdist_wininst.py
index 793c4b7..fe2b2de 100644
--- a/src/distutils2/command/bdist_wininst.py
+++ b/src/distutils2/command/bdist_wininst.py
@@ -318,7 +318,7 @@ class bdist_wininst (Command):
     # get_installer_filename()
 
     def get_exe_bytes (self):
-        from distutils2.msvccompiler import get_build_version
+        from distutils2.compiler.msvccompiler import get_build_version
         # If a target-version other than the current version has been
         # specified, then using the MSVC version from *this* build is no good.
         # Without actually finding and executing the target version and parsing
diff --git a/src/distutils2/command/build.py b/src/distutils2/command/build.py
index 57e9f7b..e1ad18a 100644
--- a/src/distutils2/command/build.py
+++ b/src/distutils2/command/build.py
@@ -11,7 +11,7 @@ from distutils2.core import Command
 from distutils2.errors import DistutilsOptionError
 
 def show_compilers():
-    from distutils2.ccompiler import show_compilers
+    from distutils2.compiler.ccompiler import show_compilers
     show_compilers()
 
 class build(Command):
diff --git a/src/distutils2/command/build_clib.py b/src/distutils2/command/build_clib.py
index 3959892..40c4b6e 100644
--- a/src/distutils2/command/build_clib.py
+++ b/src/distutils2/command/build_clib.py
@@ -19,11 +19,11 @@ __revision__ = "$Id: build_clib.py 77704 2010-01-23 09:23:15Z tarek.ziade $"
 import os
 from distutils2.core import Command
 from distutils2.errors import DistutilsSetupError
-from distutils2.ccompiler import customize_compiler
+from distutils2.compiler.ccompiler import customize_compiler
 from distutils2 import log
 
 def show_compilers():
-    from distutils2.ccompiler import show_compilers
+    from distutils2.compiler.ccompiler import show_compilers
     show_compilers()
 
 
@@ -97,7 +97,7 @@ class build_clib(Command):
             return
 
         # Yech -- this is cut 'n pasted from build_ext.py!
-        from distutils2.ccompiler import new_compiler
+        from distutils2.compiler.ccompiler import new_compiler
         self.compiler = new_compiler(compiler=self.compiler,
                                      dry_run=self.dry_run,
                                      force=self.force)
diff --git a/src/distutils2/command/build_ext.py b/src/distutils2/command/build_ext.py
index aadc45b..126c6f8 100644
--- a/src/distutils2/command/build_ext.py
+++ b/src/distutils2/command/build_ext.py
@@ -12,7 +12,7 @@ from warnings import warn
 from distutils2.util import get_platform
 from distutils2.core import Command
 from distutils2.errors import *
-from distutils2.ccompiler import customize_compiler
+from distutils2.compiler.ccompiler import customize_compiler
 from distutils2.dep_util import newer_group
 from distutils2.extension import Extension
 from distutils2 import log
@@ -40,7 +40,7 @@ extension_name_re = re.compile \
 
 
 def show_compilers ():
-    from distutils2.ccompiler import show_compilers
+    from distutils2.compiler.ccompiler import show_compilers
     show_compilers()
 
 
@@ -321,7 +321,7 @@ class build_ext(Command):
                 self.rpath.append(user_lib)
 
     def run(self):
-        from distutils2.ccompiler import new_compiler
+        from distutils2.compiler.ccompiler import new_compiler
 
         # 'self.extensions', as supplied by setup.py, is a list of
         # Extension instances.  See the documentation for Extension (in
diff --git a/src/distutils2/command/config.py b/src/distutils2/command/config.py
index 15b62a2..ab26f77 100644
--- a/src/distutils2/command/config.py
+++ b/src/distutils2/command/config.py
@@ -16,7 +16,7 @@ import re
 
 from distutils2.core import Command
 from distutils2.errors import DistutilsExecError
-from distutils2.ccompiler import customize_compiler
+from distutils2.compiler.ccompiler import customize_compiler
 from distutils2 import log
 
 LANG_EXT = {'c': '.c', 'c++': '.cxx'}
@@ -96,7 +96,7 @@ class config(Command):
         """
         # We do this late, and only on-demand, because this is an expensive
         # import.
-        from distutils2.ccompiler import CCompiler, new_compiler
+        from distutils2.compiler.ccompiler import CCompiler, new_compiler
         if not isinstance(self.compiler, CCompiler):
             self.compiler = new_compiler(compiler=self.compiler,
                                          dry_run=self.dry_run, force=1)
@@ -182,7 +182,7 @@ class config(Command):
         preprocessor succeeded, false if there were any errors.
         ('body' probably isn't of much use, but what the heck.)
         """
-        from distutils2.ccompiler import CompileError
+        from distutils2.compiler.ccompiler import CompileError
         self._check_compiler()
         ok = 1
         try:
@@ -226,7 +226,7 @@ class config(Command):
         """Try to compile a source file built from 'body' and 'headers'.
         Return true on success, false otherwise.
         """
-        from distutils2.ccompiler import CompileError
+        from distutils2.compiler.ccompiler import CompileError
         self._check_compiler()
         try:
             self._compile(body, headers, include_dirs, lang)
@@ -244,7 +244,7 @@ class config(Command):
         'headers', to executable form.  Return true on success, false
         otherwise.
         """
-        from distutils2.ccompiler import CompileError, LinkError
+        from distutils2.compiler.ccompiler import CompileError, LinkError
         self._check_compiler()
         try:
             self._link(body, headers, include_dirs,
@@ -263,7 +263,7 @@ class config(Command):
         built from 'body' and 'headers'.  Return true on success, false
         otherwise.
         """
-        from distutils2.ccompiler import CompileError, LinkError
+        from distutils2.compiler.ccompiler import CompileError, LinkError
         self._check_compiler()
         try:
             src, obj, exe = self._link(body, headers, include_dirs,