[Python-checkins] python/nondist/sandbox/distutils_refactor/distutils/command bdist.py, 1.1, 1.2 install.py, 1.1, 1.2 sdist.py, 1.1, 1.2

Fri Jun 10 08:48:16 CEST 2005

Update of /cvsroot/python/python/nondist/sandbox/distutils_refactor/distutils/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25579/distutils/command
Modified Files:
	bdist.py install.py sdist.py 
Log Message:
first bit of getting rid of fancy_getopt
Index: bdist.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/distutils_refactor/distutils/command/bdist.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2

--- bdist.py	10 Jun 2005 06:43:22 -0000	1.1
+++ bdist.py	10 Jun 2005 06:48:14 -0000	1.2
@@ -17,12 +17,12 @@
 def show_formats ():
 """Print list of available formats (arguments to "--format" option).
 """
- from distutils.fancy_getopt import FancyGetopt
+ from distutils.util import OptionPrettyPrinter
 formats=[]
 for format in bdist.format_commands:
 formats.append(("formats=" + format, None,
 bdist.format_command[format][1]))
- pretty_printer = FancyGetopt(formats)
+ pretty_printer = OptionPrettyPrinter(formats)
 pretty_printer.print_help("List of available distribution formats:")
 
 
Index: install.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/distutils_refactor/distutils/command/install.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- install.py	10 Jun 2005 06:43:22 -0000	1.1
+++ install.py	10 Jun 2005 06:48:14 -0000	1.2
@@ -346,18 +346,16 @@
 
 def dump_dirs (self, msg):
 if DEBUG:
- from distutils.fancy_getopt import longopt_xlate
 print msg + ":"
 for opt in self.user_options:
 opt_name = opt[0]
 if opt_name[-1] == "=":
 opt_name = opt_name[0:-1]
 if self.negative_opt.has_key(opt_name):
- opt_name = string.translate(self.negative_opt[opt_name],
- longopt_xlate)
+ opt_name = self.negative_opt[opt_name].replace('-','_')
 val = not getattr(self, opt_name)
 else:
- opt_name = string.translate(opt_name, longopt_xlate)
+ opt_name = opt_name.replace('-','_')
 val = getattr(self, opt_name)
 print " %s: %s" % (opt_name, val)
 
Index: sdist.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/distutils_refactor/distutils/command/sdist.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sdist.py	10 Jun 2005 06:43:22 -0000	1.1
+++ sdist.py	10 Jun 2005 06:48:14 -0000	1.2
@@ -21,14 +21,14 @@
 """Print all possible values for the 'formats' option (used by
 the "--help-formats" command-line option).
 """
- from distutils.fancy_getopt import FancyGetopt
+ from distutils.util import OptionPrettyPrinter
 from distutils.archive_util import ARCHIVE_FORMATS
 formats=[]
 for format in ARCHIVE_FORMATS.keys():
 formats.append(("formats=" + format, None,
 ARCHIVE_FORMATS[format][2]))
 formats.sort()
- pretty_printer = FancyGetopt(formats)
+ pretty_printer = OptionPrettyPrinter(formats)
 pretty_printer.print_help(
 "List of available source distribution formats:")
 
