options moved from build_py to build so that build_py and build_scripts can access it

4 files changed, 24 insertions, 4 deletions

diff --git a/src/distutils2/command/build.py b/src/distutils2/command/build.py
index bdd2818..f6bba64 100644
--- a/src/distutils2/command/build.py
+++ b/src/distutils2/command/build.py
@@ -43,6 +43,12 @@ class build(Command):
          "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 @@ class build(Command):
         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
index df0ed2b..cf49cf5 100644
--- a/src/distutils2/command/build_py.py
+++ b/src/distutils2/command/build_py.py
@@ -53,11 +53,16 @@ class build_py(Command, Mixin2to3):
         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
index b62ade7..3ba358d 100644
--- a/src/distutils2/command/build_scripts.py
+++ b/src/distutils2/command/build_scripts.py
@@ -36,10 +36,17 @@ class build_scripts (Command):
         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
index f716fb3..5e9bc70 100644
--- a/src/distutils2/command/cmd.py
+++ b/src/distutils2/command/cmd.py
@@ -330,7 +330,6 @@ class Command(object):
                 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