summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/core.py
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2014-03-12 08:10:51 (GMT)
committerÉric Araujo <merwok@netwok.org>2014-03-12 08:10:51 (GMT)
commita0fe1f74f928bec969dad25e8dc97b560748b182 (patch)
treecd4aebc7d8e5ed6d8e7671013cb464e3f6af608d /Lib/distutils/core.py
parent03a4da55cba54bd7237c686ae39cf175f723c785 (diff)
parentfc773a2d4ba3810b982e703bf8a240206369e5d1 (diff)
downloadcpython-a0fe1f74f928bec969dad25e8dc97b560748b182.zip
cpython-a0fe1f74f928bec969dad25e8dc97b560748b182.tar.gz
cpython-a0fe1f74f928bec969dad25e8dc97b560748b182.tar.bz2
Merge 3.3 (#4931)
Diffstat (limited to 'Lib/distutils/core.py')
-rw-r--r--Lib/distutils/core.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/Lib/distutils/core.py b/Lib/distutils/core.py
index c811d5b..2bfe66a 100644
--- a/Lib/distutils/core.py
+++ b/Lib/distutils/core.py
@@ -11,7 +11,6 @@ import sys
from distutils.debug import DEBUG
from distutils.errors import *
-from distutils.util import grok_environment_error
# Mainly import these so setup scripts can "from distutils.core import" them.
from distutils.dist import Distribution
@@ -150,13 +149,11 @@ def setup (**attrs):
except KeyboardInterrupt:
raise SystemExit("interrupted")
except OSError as exc:
- error = grok_environment_error(exc)
-
if DEBUG:
- sys.stderr.write(error + "\n")
+ sys.stderr.write("error: %s\n" % (exc,))
raise
else:
- raise SystemExit(error)
+ raise SystemExit("error: %s" % (exc,))
except (DistutilsError,
CCompilerError) as msg: