[Python-checkins] distutils2: options moved from build_py to build so that build_py and build_scripts can
tarek.ziade
python-checkins at python.org
Thu Aug 19 08:34:14 CEST 2010
tarek.ziade pushed 5fedc36e564c to distutils2:
http://hg.python.org/distutils2/rev/5fedc36e564c
changeset: 574:5fedc36e564c
user: Zubin Mithra <zubin.mithra at gmail.com>
date: Fri Aug 13 18:42:47 2010 +0530
summary: options moved from build_py to build so that build_py and build_scripts can access it
files: src/distutils2/command/build.py, src/distutils2/command/build_py.py, src/distutils2/command/build_scripts.py, src/distutils2/command/cmd.py
diff --git a/src/distutils2/command/build.py b/src/distutils2/command/build.py
--- a/src/distutils2/command/build.py
+++ b/src/distutils2/command/build.py
@@ -43,6 +43,12 @@
"forcibly build everything (ignore file timestamps)"),
('executable=', 'e',
"specify final destination interpreter path (build.py)"),
+ ('use-2to3', None,
+ "use 2to3 to make source python 3.x compatible"),
+ ('convert-2to3-doctests', None,
+ "use 2to3 to convert doctests in seperate text files"),
+ ('use-2to3-fixers', None,
+ "list additional fixers opted for during 2to3 conversion"),
]
boolean_options = ['debug', 'force']
@@ -66,6 +72,9 @@
self.debug = None
self.force = 0
self.executable = None
+ self.use_2to3 = False
+ self.convert_2to3_doctests = None
+ self.use_2to3_fixers = None
def finalize_options(self):
if self.plat_name is None:
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
@@ -53,11 +53,16 @@
self._updated_files = []
self._doctests_2to3 = []
self.use_2to3 = False
- self.convert_2to3_doctests = []
- self.use_2to3_fixers = []
+ self.convert_2to3_doctests = None
+ self.use_2to3_fixers = None
def finalize_options(self):
- self.set_undefined_options('build', 'build_lib', 'force')
+ self.set_undefined_options('build',
+ ('use_2to3', 'use_2to3'),
+ ('use_2to3_fixers', 'use_2to3_fixers'),
+ ('convert_2to3_doctests',
+ '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
@@ -36,10 +36,17 @@
self.force = None
self.executable = None
self.outfiles = None
+ self.use_2to3 = False
+ self.convert_2to3_doctests = None
+ self.use_2to3_fixers = None
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')
self.scripts = self.distribution.scripts
diff --git a/src/distutils2/command/cmd.py b/src/distutils2/command/cmd.py
--- a/src/distutils2/command/cmd.py
+++ b/src/distutils2/command/cmd.py
@@ -330,7 +330,6 @@
setattr(self, dst_option,
getattr(src_cmd_obj, src_option))
-
def get_finalized_command(self, command, create=1):
"""Wrapper around Distribution's 'get_command_obj()' method: find
(create if necessary and 'create' is true) the command object for
--
Repository URL: http://hg.python.org/distutils2
More information about the Python-checkins
mailing list