Import exceptions from errors.py, not ccompiler.py.

diff --git a/Lib/distutils/msvccompiler.py b/Lib/distutils/msvccompiler.py
index 06b415ebde0953d8d54bf9472659543c4ddffb9b..06d8501afa2131c2b053e9a21f32b4c8c7e25bfc 100644 (file)
--- a/Lib/distutils/msvccompiler.py
+++ b/Lib/distutils/msvccompiler.py
@@ -12,11 +12,11 @@ __revision__ = "$Id$"
 
 import sys, os, string
 from types import *
-from distutils.errors import *
-from distutils.ccompiler import \
-     CCompiler, gen_preprocess_options, gen_lib_options, \
+from distutils.errors import \
+     DistutilsExecError, DistutilsPlatformError, \
      CompileError, LibError, LinkError
-
+from distutils.ccompiler import \
+     CCompiler, gen_preprocess_options, gen_lib_options
 
 _can_read_reg = 0
 try:

diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
index c2f841ff67d048169ad1314a68b43f5943d1134f..4d38e4d8c1fc83c0afea401531d8b23e9667f3e6 100644 (file)
--- a/Lib/distutils/unixccompiler.py
+++ b/Lib/distutils/unixccompiler.py
@@ -22,9 +22,9 @@ from types import *
 from copy import copy
 from distutils import sysconfig
 from distutils.ccompiler import \
-     CCompiler, gen_preprocess_options, gen_lib_options, \
-     CompileError, LibError, LinkError
-from distutils.errors import DistutilsExecError
+     CCompiler, gen_preprocess_options, gen_lib_options
+from distutils.errors import \
+     DistutilsExecError, CompileError, LibError, LinkError
 
 # XXX Things not currently handled:
 #   * optimization/debug/warning flags; we just use whatever's in Python's