[Python-checkins] distutils2: options made to be a build attribute instead of as a distribution attribute
tarek.ziade
python-checkins at python.org
Thu Aug 19 08:34:13 CEST 2010
tarek.ziade pushed f83566642348 to distutils2:
http://hg.python.org/distutils2/rev/f83566642348
changeset: 565:f83566642348
user: Zubin Mithra <zubin.mithra at gmail.com>
date: Thu Jul 29 21:49:07 2010 +0530
summary: options made to be a build attribute instead of as a distribution attribute
files: src/distutils2/command/build.py, src/distutils2/command/build_py.py, src/distutils2/dist.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
@@ -144,4 +144,4 @@
('build_clib', has_c_libraries),
('build_ext', has_ext_modules),
('build_scripts', has_scripts),
- ]
+ ]
\ No newline at end of file
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
@@ -80,6 +80,12 @@
"also compile with optimization: -O1 for \"python -O\", "
"-O2 for \"python -OO\", and -O0 to disable [default: -O0]"),
('force', 'f', "forcibly build everything (ignore file timestamps)"),
+ ('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 = ['compile', 'force']
@@ -96,7 +102,10 @@
self.force = None
self._updated_files = []
self._doctests_2to3 = []
-
+ self.use_2to3 = False
+ self.convert_2to3_doctests = []
+ self.use_2to3_fixers = []
+
def finalize_options(self):
self.set_undefined_options('build',
('build_lib', 'build_lib'),
@@ -150,7 +159,7 @@
self.build_packages()
self.build_package_data()
- if self.distribution.use_2to3 and self._updated_files:
+ if self.use_2to3 and self._updated_files:
self.run_2to3(self._updated_files, self._doctests_2to3,
self.distribution.use_2to3_fixers)
diff --git a/src/distutils2/dist.py b/src/distutils2/dist.py
--- a/src/distutils2/dist.py
+++ b/src/distutils2/dist.py
@@ -113,12 +113,6 @@
"print the list of packages/modules required"),
('obsoletes', None,
"print the list of packages/modules made obsolete"),
- ('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")
]
display_option_names = map(lambda x: translate_longopt(x[0]),
display_options)
@@ -212,9 +206,6 @@
self.scripts = None
self.data_files = None
self.password = ''
- self.use_2to3 = False
- self.convert_2to3_doctests = []
- self.use_2to3_fixers = []
# And now initialize bookkeeping stuff that can't be supplied by
# the caller at all. 'command_obj' maps command names to
--
Repository URL: http://hg.python.org/distutils2
More information about the Python-checkins
mailing list