Skip to content

gh-85308: Add argparse tests for reading non-ASCII arguments from file #94160

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

Merged
serhiy-storchaka merged 3 commits into from
Jun 24, 2022
Merged

gh-85308: Add argparse tests for reading non-ASCII arguments from file #94160

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d1330d
gh-85308: Add argparse tests for reading non-ASCII arguments from file
serhiy-storchaka Jun 23, 2022
2e2250a
Fix tests on Windows.
serhiy-storchaka Jun 23, 2022
c47e76d
Try to fix tests on Windows again.
serhiy-storchaka Jun 24, 2022
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
Prev Previous commit
Try to fix tests on Windows again.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Jun 24, 2022
commit c47e76db4e73422e3879bbd57801eba6b4c98a8a
5 changes: 5 additions & 0 deletions Lib/test/support/os_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,11 @@
try:
name.decode(sys.getfilesystemencoding())
except UnicodeDecodeError:
try:
name.decode(sys.getfilesystemencoding(),
sys.getfilesystemencodeerrors())
except UnicodeDecodeError:
continue
TESTFN_UNDECODABLE = os.fsencode(TESTFN_ASCII) + name
break

Expand Down
5 changes: 2 additions & 3 deletions Lib/test/test_argparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1505,7 +1505,7 @@ class TestArgumentsFromFile(TempDirMixin, ParserTestCase):
def setUp(self):
super(TestArgumentsFromFile, self).setUp()
file_texts = [
('hello', self.hello.encode(sys.getfilesystemencoding()) + b'\n'),
('hello', os.fsencode(self.hello) + b'\n'),
('recursive', b'-a\n'
b'A\n'
b'@hello'),
Expand Down Expand Up @@ -1535,8 +1535,7 @@ def setUp(self):
]
if os_helper.TESTFN_UNDECODABLE:
undecodable = os_helper.TESTFN_UNDECODABLE.lstrip(b'@')
decoded_undecodable = undecodable.decode(sys.getfilesystemencoding(),
sys.getfilesystemencodeerrors())
decoded_undecodable = os.fsdecode(undecodable)
successes += [
('@undecodable X', NS(a=None, x=decoded_undecodable, y=['X'])),
('X @undecodable', NS(a=None, x='X', y=[decoded_undecodable])),
Expand Down