[Python-checkins] r72537 - in python/branches/py3k: Lib/distutils/command/install_lib.py Lib/distutils/tests/test_install_lib.py

[tarek.ziade]

Author: tarek.ziade
Date: Sun May 10 13:45:41 2009
New Revision: 72537

Log:
Merged revisions 72535 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72535 | tarek.ziade | 2009-05-10 13:42:46 +0200 (Sun, 10 May 2009) | 1 line
  
  Added tests form install_lib and pep8-fied the module
........


Added:
   python/branches/py3k/Lib/distutils/tests/test_install_lib.py
      - copied unchanged from r72535, /python/trunk/Lib/distutils/tests/test_install_lib.py
Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/distutils/command/install_lib.py

Modified: python/branches/py3k/Lib/distutils/command/install_lib.py
==============================================================================
--- python/branches/py3k/Lib/distutils/command/install_lib.py	(original)
+++ python/branches/py3k/Lib/distutils/command/install_lib.py	Sun May 10 13:45:41 2009
@@ -5,7 +5,7 @@
 
 __revision__ = "$Id$"
 
-import sys, os
+import os
 from distutils.core import Command
 from distutils.errors import DistutilsOptionError
 
@@ -57,7 +57,6 @@
         self.skip_build = None
 
     def finalize_options(self):
-
         # Get all the information we need to install pure Python modules
         # from the umbrella 'install' command -- build (source) directory,
         # install (target) directory, and whether to compile .py files.
@@ -78,7 +77,7 @@
         if not isinstance(self.optimize, int):
             try:
                 self.optimize = int(self.optimize)
-                assert 0 <= self.optimize <= 2
+                assert self.optimize in (0, 1, 2)
             except (ValueError, AssertionError):
                 raise DistutilsOptionError("optimize must be 0, 1, or 2")
 
@@ -95,7 +94,6 @@
         if outfiles is not None and self.distribution.has_pure_modules():
             self.byte_compile(outfiles)
 
-
     # -- Top-level worker functions ------------------------------------
     # (called from 'run()')