diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-07-05 16:06:05 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-07-05 16:06:05 (GMT) |
| commit | 3caf7b9c888cafa286039379f642cbd09c7ae7cf (patch) | |
| tree | e28f588d62194fdc861c9e476d86390e3f58fc37 | |
| parent | 5261b10556d11b206d878b8382016fbfcc703927 (diff) | |
| download | cpython-3caf7b9c888cafa286039379f642cbd09c7ae7cf.zip cpython-3caf7b9c888cafa286039379f642cbd09c7ae7cf.tar.gz cpython-3caf7b9c888cafa286039379f642cbd09c7ae7cf.tar.bz2 | |
#9161: Fix regression in acceptance of unicode strings in add_option calls.
The original change in 2.6 was made during rc1 changeover, and did not
get ported to 2.7. The original change may not even have been
intentional, but if so it doesn't seem to have caused any problems.
| -rw-r--r-- | Lib/optparse.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/optparse.py b/Lib/optparse.py index 8ab3291..87d7737 100644 --- a/Lib/optparse.py +++ b/Lib/optparse.py @@ -1008,7 +1008,7 @@ class OptionContainer: """add_option(Option) add_option(opt_str, ..., kwarg=val, ...) """ - if type(args[0]) is types.StringType: + if type(args[0]) in types.StringTypes: option = self.option_class(*args, **kwargs) elif len(args) == 1 and not kwargs: option = args[0] @@ -16,6 +16,9 @@ Core and Builtins Library ------- +- Issue #9161: Fix regression in optparse's acceptance of unicode + strings in add_option calls. + - Issue #9130: Fix validation of relative imports in parser module. - Issue #9128: Fix validation of class decorators in parser module. |