From: Greg Ward <gward@python.net>
Date: Tue, 30 May 2000 02:02:49 +0000 (+0000)
Subject: Import exceptions from errors.py, not ccompiler.py.
X-Git-Tag: v2.0b1~1638
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3add77f6110346a2ee7d0baa1d159f6685970b8b;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/distutils/msvccompiler.py b/Lib/distutils/msvccompiler.py
index 06b415ebde09..06d8501afa21 100644
--- 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 c2f841ff67d0..4d38e4d8c1fc 100644
--- 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