Skip to content

[2.7] bpo-24307: Fix unicode error in optparse with unicode value for %default #9911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tirkarthi wants to merge 3 commits into from
Closed

[2.7] bpo-24307: Fix unicode error in optparse with unicode value for %default #9911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80021a2
Encode default value before replacement in option
tirkarthi Sep 23, 2018
ae41d97
Add NEWS
tirkarthi Sep 23, 2018
fc3c87d
Use unicode to fix double encoding during conversion
tirkarthi Oct 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/optparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ def expand_default(self, option):
if default_value is NO_DEFAULT or default_value is None:
default_value = self.NO_DEFAULT_VALUE

return option.help.replace(self.default_tag, str(default_value))
return option.help.replace(self.default_tag, unicode(default_value))

def format_option(self, option):
# The help for each option consists of two parts:
Expand Down
9 changes: 9 additions & 0 deletions Lib/test/test_optparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,15 @@ def test_float_default(self):
" -p PROB, --prob=PROB blow up with probability PROB [default: 0.43]\n"
self.assertHelp(self.parser, expected_help)

def test_unicode_default(self):
self.parser.add_option(
"-p", "--prob",
help="blow up with probability PROB [default: %default]")
self.parser.set_defaults(prob=u"ol\u00E9!")
expected_help = self.help_prefix + \
u" -p PROB, --prob=PROB blow up with probability PROB [default: ol\u00E9!]\n"
self.assertHelp(self.parser, expected_help)

def test_alt_expand(self):
self.parser.add_option("-f", "--file",
default="foo.txt",
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2018-09-23-19-44-54.bpo-24307.EAcncD.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Encode default value before replacing it in the option. Based on patch by
tanbro-liu.