mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-04 16:01:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge 3.3 (#4931)

Browse source
This commit is contained in:
Éric Araujo 2014-03-12 04:10:51 -04:00
commit a0fe1f74f9
6 changed files with 20 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/distutils/core.py
View file

@ -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: