From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Tue, 31 Mar 2009 22:50:54 +0000 (+0000)
Subject: Merged revisions 70920,70922 via svnmerge from
X-Git-Tag: v3.1a2~115
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30911294d8f1bfd18206b0ed66b3a986c21b6f78;p=python

Merged revisions 70920,70922 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70920 | tarek.ziade | 2009-03-31 17:44:10 -0500 (Tue, 31 Mar 2009) | 1 line

  catching msvc9compiler error as well
........
  r70922 | tarek.ziade | 2009-03-31 17:47:01 -0500 (Tue, 31 Mar 2009) | 1 line

  fixed the test for win32 CompileError
........
---

diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index 229590664c..ade95be229 100644
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -457,7 +457,7 @@ class build_ext(Command):
         for ext in self.extensions:
             try:
                 self.build_extension(ext)
-            except (CCompilerError, DistutilsError) as e:
+            except (CCompilerError, DistutilsError, CompileError) as e:
                 if not ext.optional:
                     raise
                 self.warn('building extension "%s" failed: %s' %
diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
index 094f4b6644..5ea67bedb7 100644
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -11,6 +11,7 @@ from distutils.tests.support import TempdirManager
 from distutils.tests.support import LoggingSilencer
 from distutils.extension import Extension
 from distutils.errors import UnknownFileError
+from distutils.errors import CompileError
 
 import unittest
 from test import support
@@ -154,7 +155,8 @@ class BuildExtTestCase(TempdirManager,
         dist = Distribution({'name': 'xx', 'ext_modules': modules})
         cmd = build_ext(dist)
         cmd.ensure_finalized()
-        self.assertRaises(UnknownFileError, cmd.run)  # should raise an error
+        self.assertRaises((UnknownFileError, CompileError),
+                          cmd.run)  # should raise an error
 
         modules = [Extension('foo', ['xxx'], optional=True)]
         dist = Distribution({'name': 'xx', 'ext_modules': modules})