[Python-checkins] r72581 - in python/branches/release30-maint: Lib/distutils/command/install_lib.py

[tarek.ziade]

Author: tarek.ziade
Date: Tue May 12 09:08:44 2009
New Revision: 72581

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

................
  r72579 | tarek.ziade | 2009-05-12 09:06:42 +0200 (Tue, 12 May 2009) | 9 lines
  
  Merged revisions 72577 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r72577 | tarek.ziade | 2009-05-12 09:01:29 +0200 (Tue, 12 May 2009) | 1 line
    
    removing the assert statement so the code works when Python is run with -O
  ........
................


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/distutils/command/install_lib.py

Modified: python/branches/release30-maint/Lib/distutils/command/install_lib.py
==============================================================================
--- python/branches/release30-maint/Lib/distutils/command/install_lib.py	(original)
+++ python/branches/release30-maint/Lib/distutils/command/install_lib.py	Tue May 12 09:08:44 2009
@@ -73,7 +73,8 @@
         if not isinstance(self.optimize, int):
             try:
                 self.optimize = int(self.optimize)
-                assert 0 <= self.optimize <= 2
+                if self.optimize not in (0, 1, 2):
+                    raise AssertionError
             except (ValueError, AssertionError):
                 raise DistutilsOptionError("optimize must be 0, 1, or 2")