diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py
index ff2fc338cbf239..589ef19dd34cc2 100644
--- a/Lib/test/support/os_helper.py
+++ b/Lib/test/support/os_helper.py
@@ -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
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index 299eb30b4332bf..673ef89b5e1cfe 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -1505,14 +1505,15 @@ class TestArgumentsFromFile(TempDirMixin, ParserTestCase):
def setUp(self):
super(TestArgumentsFromFile, self).setUp()
file_texts = [
- ('hello', 'hello world!\n'),
- ('recursive', '-a\n'
- 'A\n'
- '@hello'),
- ('invalid', '@no-such-path\n'),
+ ('hello', os.fsencode(self.hello) + b'\n'),
+ ('recursive', b'-a\n'
+ b'A\n'
+ b'@hello'),
+ ('invalid', b'@no-such-path\n'),
+ ('undecodable', self.undecodable + b'\n'),
]
for path, text in file_texts:
- with open(path, 'w', encoding="utf-8") as file:
+ with open(path, 'wb') as file:
file.write(text)
parser_signature = Sig(fromfile_prefix_chars='@')
@@ -1522,15 +1523,25 @@ def setUp(self):
Sig('y', nargs='+'),
]
failures = ['', '-b', 'X', '@invalid', '@missing']
+ hello = 'hello world!' + os_helper.FS_NONASCII
successes = [
('X Y', NS(a=None, x='X', y=['Y'])),
('X -a A Y Z', NS(a='A', x='X', y=['Y', 'Z'])),
- ('@hello X', NS(a=None, x='hello world!', y=['X'])),
- ('X @hello', NS(a=None, x='X', y=['hello world!'])),
- ('-a B @recursive Y Z', NS(a='A', x='hello world!', y=['Y', 'Z'])),
- ('X @recursive Z -a B', NS(a='B', x='X', y=['hello world!', 'Z'])),
+ ('@hello X', NS(a=None, x=hello, y=['X'])),
+ ('X @hello', NS(a=None, x='X', y=[hello])),
+ ('-a B @recursive Y Z', NS(a='A', x=hello, y=['Y', 'Z'])),
+ ('X @recursive Z -a B', NS(a='B', x='X', y=[hello, 'Z'])),
(["-a", "", "X", "Y"], NS(a='', x='X', y=['Y'])),
]
+ if os_helper.TESTFN_UNDECODABLE:
+ undecodable = os_helper.TESTFN_UNDECODABLE.lstrip(b'@')
+ 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])),
+ ]
+ else:
+ undecodable = b''
class TestArgumentsFromFileConverter(TempDirMixin, ParserTestCase):
@@ -1539,10 +1550,10 @@ class TestArgumentsFromFileConverter(TempDirMixin, ParserTestCase):
def setUp(self):
super(TestArgumentsFromFileConverter, self).setUp()
file_texts = [
- ('hello', 'hello world!\n'),
+ ('hello', b'hello world!\n'),
]
for path, text in file_texts:
- with open(path, 'w', encoding="utf-8") as file:
+ with open(path, 'wb') as file:
file.write(text)
class FromFileConverterArgumentParser(ErrorRaisingArgumentParser):
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy