Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Change to use the new 'translate_longopt()' function from fancy_getopt, rather 

than rolling our own with fancy_getopt's 'longopt_xlate' global.
This commit is contained in:
Greg Ward 2000-09-25 01:58:07 +00:00
parent d644ca2120
commit 2f2b6c62ba
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/distutils/dist.py
View File

@ -14,7 +14,7 @@ from types import *
from copy import copy from copy import copy
from distutils.errors import * from distutils.errors import *
from distutils import sysconfig from distutils import sysconfig
from distutils.fancy_getopt import FancyGetopt, longopt_xlate from distutils.fancy_getopt import FancyGetopt, translate_longopt
from distutils.util import check_environ, strtobool from distutils.util import check_environ, strtobool
@ -86,8 +86,8 @@ class Distribution:
('long-description', None, ('long-description', None,
"print the long package description"), "print the long package description"),
] ]
display_option_names = map(lambda x: string.translate(x[0], longopt_xlate), display_option_names = map(lambda x: translate_longopt(x[0]),
display_options) display_options)
# negative options are options that exclude other options # negative options are options that exclude other options
negative_opt = {'quiet': 'verbose'} negative_opt = {'quiet': 'verbose'}
@ -592,7 +592,7 @@ class Distribution:
for (opt, val) in option_order: for (opt, val) in option_order:
if val and is_display_option.get(opt): if val and is_display_option.get(opt):
opt = string.translate (opt, longopt_xlate) opt = translate_longopt(opt)
print getattr(self.metadata, "get_"+opt)() print getattr(self.metadata, "get_"+opt)()
any_display_options = 1 any_display_options = 1
@ -746,7 +746,7 @@ class Distribution:
for (option, (source, value)) in option_dict.items(): for (option, (source, value)) in option_dict.items():
if DEBUG: print " %s = %s (from %s)" % (option, value, source) if DEBUG: print " %s = %s (from %s)" % (option, value, source)
try: try:
bool_opts = command_obj.boolean_options bool_opts = map(translate_longopt, command_obj.boolean_options)
except AttributeError: except AttributeError:
bool_opts = [] bool_opts = []
try: try: