moved general functions out of ccompiler

3 files changed, 9 insertions, 9 deletions

diff --git a/distutils2/command/build_clib.py b/distutils2/command/build_clib.py
index 5f20bb0..de49191 100644
--- a/distutils2/command/build_clib.py
+++ b/distutils2/command/build_clib.py
@@ -18,11 +18,12 @@ module."""
 import os
 from distutils2.command.cmd import Command
 from distutils2.errors import DistutilsSetupError
-from distutils2.compiler.ccompiler import customize_compiler
+from distutils2.compiler import customize_compiler
 from distutils2 import logger
 
+
 def show_compilers():
-    from distutils2.compiler.ccompiler import show_compilers
+    from distutils2.compiler import show_compilers
     show_compilers()
 
 
@@ -94,7 +95,7 @@ class build_clib(Command):
             return
 
         # Yech -- this is cut 'n pasted from build_ext.py!
-        from distutils2.compiler.ccompiler import new_compiler
+        from distutils2.compiler import new_compiler
         self.compiler = new_compiler(compiler=self.compiler,
                                      dry_run=self.dry_run,
                                      force=self.force)
diff --git a/distutils2/command/build_ext.py b/distutils2/command/build_ext.py
index df71f1c..0d2831d 100644
--- a/distutils2/command/build_ext.py
+++ b/distutils2/command/build_ext.py
@@ -12,7 +12,7 @@ from distutils2.util import get_platform
 from distutils2.command.cmd import Command
 from distutils2.errors import (CCompilerError, CompileError, DistutilsError,
                                DistutilsPlatformError, DistutilsSetupError)
-from distutils2.compiler.ccompiler import customize_compiler
+from distutils2.compiler import customize_compiler
 from distutils2.util import newer_group
 from distutils2.extension import Extension
 from distutils2 import logger
@@ -334,7 +334,7 @@ class build_ext(Command):
                 self.rpath.append(user_lib)
 
     def run(self):
-        from distutils2.compiler.ccompiler import new_compiler
+        from distutils2.compiler 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/distutils2/command/config.py b/distutils2/command/config.py
index 20c3a2c..0f4ae9f 100644
--- a/distutils2/command/config.py
+++ b/distutils2/command/config.py
@@ -8,14 +8,12 @@ list of standard commands.  Also, this is a good place to put common
 configure-like tasks: "try to compile this C code", or "figure out where
 this header file lives".
 """
-
-
 import os
 import re
 
 from distutils2.command.cmd import Command
 from distutils2.errors import DistutilsExecError
-from distutils2.compiler.ccompiler import customize_compiler
+from distutils2.compiler import customize_compiler
 from distutils2 import logger
 
 LANG_EXT = {'c': '.c', 'c++': '.cxx'}
@@ -95,7 +93,8 @@ class config(Command):
         """
         # We do this late, and only on-demand, because this is an expensive
         # import.
-        from distutils2.compiler.ccompiler import CCompiler, new_compiler
+        from distutils2.compiler.ccompiler import CCompiler
+        from distutils2.compiler import new_compiler
         if not isinstance(self.compiler, CCompiler):
             self.compiler = new_compiler(compiler=self.compiler,
                                          dry_run=self.dry_run, force=1)