string.maketrans() now produces translation tables for bytes.translate() -- wrong module?
Fix all remaining instances that did bad things with the new str.translate().
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
index 29cda1e..ffd68db 100644
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -348,11 +348,10 @@
if opt_name[-1] == "=":
opt_name = opt_name[0:-1]
if self.negative_opt.has_key(opt_name):
- opt_name = self.negative_opt[opt_name].translate(
- longopt_xlate)
+ opt_name = longopt_xlate(self.negative_opt[opt_name])
val = not getattr(self, opt_name)
else:
- opt_name = opt_name.translate(longopt_xlate)
+ opt_name = longopt_xlate(opt_name)
val = getattr(self, opt_name)
print(" %s: %s" % (opt_name, val))
diff --git a/Lib/distutils/fancy_getopt.py b/Lib/distutils/fancy_getopt.py
index 5434334..15cbdd7 100644
--- a/Lib/distutils/fancy_getopt.py
+++ b/Lib/distutils/fancy_getopt.py
@@ -26,7 +26,7 @@
# This is used to translate long options to legitimate Python identifiers
# (for use as attributes of some object).
-longopt_xlate = string.maketrans('-', '_')
+longopt_xlate = lambda s: s.replace('-', '_')
class FancyGetopt:
"""Wrapper around the standard 'getopt()' module that provides some
@@ -107,7 +107,7 @@
"""Translate long option name 'long_option' to the form it
has as an attribute of some object: ie., translate hyphens
to underscores."""
- return long_option.translate(longopt_xlate)
+ return longopt_xlate(long_option)
def _check_alias_dict(self, aliases, what):
assert isinstance(aliases, dict)
@@ -372,7 +372,7 @@
return parser.getopt(args, object)
-WS_TRANS = string.maketrans(string.whitespace, ' ' * len(string.whitespace))
+WS_TRANS = {ord(_wschar) : ' ' for _wschar in string.whitespace}
def wrap_text(text, width):
"""wrap_text(text : string, width : int) -> [string]
@@ -432,7 +432,7 @@
"""Convert a long option name to a valid Python identifier by
changing "-" to "_".
"""
- return opt.translate(longopt_xlate)
+ return longopt_xlate(opt)
class OptionDummy: