[Python-checkins] r74165 - in python/branches/release31-maint: Lib/distutils/extension.py Misc/NEWS

[tarek.ziade]

Author: tarek.ziade
Date: Wed Jul 22 11:03:01 2009
New Revision: 74165

Log:
Merged revisions 74164 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r74164 | tarek.ziade | 2009-07-22 10:57:28 +0200 (Wed, 22 Jul 2009) | 9 lines
  
  Merged revisions 74163 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r74163 | tarek.ziade | 2009-07-22 10:55:19 +0200 (Wed, 22 Jul 2009) | 1 line
    
    Issue #6545: Removed assert statements in distutils.Extension, so the behavior is similar when used with -O
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/distutils/extension.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/distutils/extension.py
==============================================================================
--- python/branches/release31-maint/Lib/distutils/extension.py	(original)
+++ python/branches/release31-maint/Lib/distutils/extension.py	Wed Jul 22 11:03:01 2009
@@ -103,10 +103,11 @@
                   optional=None,
                   **kw                      # To catch unknown keywords
                  ):
-        assert isinstance(name, str), "'name' must be a string"
-        assert (isinstance(sources, list) and
-                all(isinstance(v, str) for v in sources)), \
-                "'sources' must be a list of strings"
+        if not isinstance(name, str):
+            raise AssertionError("'name' must be a string")
+        if not (isinstance(sources, list) and
+                all(isinstance(v, str) for v in sources)):
+            raise AssertionError("'sources' must be a list of strings")
 
         self.name = name
         self.sources = sources

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Wed Jul 22 11:03:01 2009
@@ -892,6 +892,9 @@
 Library
 -------
 
+- Issue #6545: Removed assert statements in distutils.Extension, so the 
+  behavior is similar when used with -O.
+
 - Issue #6459: distutils.command.build_ext.get_export_symbols now uses the 
   "PyInit" prefix, rather than "init".