[Python-checkins] distutils2: Merge
tarek.ziade
python-checkins at python.org
Thu Aug 19 08:34:14 CEST 2010
tarek.ziade pushed 731247abb4d0 to distutils2:
http://hg.python.org/distutils2/rev/731247abb4d0
changeset: 579:731247abb4d0
parent: 578:9b4c69f0d96b
parent: 577:de6e995195cd
user: ?ric Araujo <merwok at netwok.org>
date: Sat Aug 14 06:44:21 2010 +0200
summary: Merge
files:
diff --git a/src/distutils2/command/build_py.py b/src/distutils2/command/build_py.py
--- a/src/distutils2/command/build_py.py
+++ b/src/distutils2/command/build_py.py
@@ -58,11 +58,9 @@
def finalize_options(self):
self.set_undefined_options('build',
- ('use_2to3', 'use_2to3'),
- ('use_2to3_fixers', 'use_2to3_fixers'),
- ('convert_2to3_doctests',
- 'convert_2to3_doctests'),
- 'build_lib', 'force')
+ 'use_2to3', 'use_2to3_fixers',
+ 'convert_2to3_doctests', 'build_lib',
+ 'force')
# Get the distribution options that are aliases for build_py
# options -- list of packages and list of modules.
diff --git a/src/distutils2/command/build_scripts.py b/src/distutils2/command/build_scripts.py
--- a/src/distutils2/command/build_scripts.py
+++ b/src/distutils2/command/build_scripts.py
@@ -44,11 +44,9 @@
def finalize_options (self):
self.set_undefined_options('build',
('build_scripts', 'build_dir'),
- ('use_2to3', 'use_2to3'),
- ('use_2to3_fixers', 'use_2to3_fixers'),
- ('convert_2to3_doctests',
- 'convert_2to3_doctests'),
- 'force', 'executable')
+ 'use_2to3', 'use_2to3_fixers',
+ 'convert_2to3_doctests', 'force',
+ 'executable')
self.scripts = self.distribution.scripts
def get_source_files(self):
--
Repository URL: http://hg.python.org/distutils2
More information about the Python-checkins
mailing list