[Python-checkins] r43406 - sandbox/trunk/setuptools/setuptools/command/install.py

Tue Mar 28 21:07:54 CEST 2006

Author: phillip.eby
Date: Tue Mar 28 21:07:52 2006
New Revision: 43406
Modified:
 sandbox/trunk/setuptools/setuptools/command/install.py
Log:
Support Python 2.5, which now includes its own install_egg_info command.
Modified: sandbox/trunk/setuptools/setuptools/command/install.py
==============================================================================

--- sandbox/trunk/setuptools/setuptools/command/install.py	(original)
+++ sandbox/trunk/setuptools/setuptools/command/install.py	Tue Mar 28 21:07:52 2006
@@ -10,17 +10,17 @@
 ('single-version-externally-managed', None,
 "used by system package builders to create 'flat' eggs"),
 ]
-
 boolean_options = _install.boolean_options + [
 'old-and-unmanageable', 'single-version-externally-managed',
 ]
-
- sub_commands = [
- cmd for cmd in _install.sub_commands if cmd[0] != 'install_scripts'
- ] + [
+ new_commands = [
 ('install_egg_info', lambda self: True),
 ('install_scripts', lambda self: True),
 ]
+ _nc = dict(new_commands)
+ sub_commands = [
+ cmd for cmd in _install.sub_commands if cmd[0] not in _nc
+ ] + new_commands
 
 def initialize_options(self):
 _install.initialize_options(self)
