mirror of
https://github.com/python/cpython.git
synced 2025-07-19 09:15:34 +00:00
Issue #8391: os.execvpe() and os.getenv() supports unicode with surrogates and
bytes strings for environment keys and values
This commit is contained in:
parent
534db4e19f
commit
13bb71c38f
5 changed files with 123 additions and 169 deletions
|
@ -782,7 +782,7 @@ class POSIXProcessTestCase(BaseTestCase):
|
|||
self.assertStderrEqual(stderr, b'')
|
||||
self.assertEqual(p.wait(), -signal.SIGTERM)
|
||||
|
||||
def test_surrogates(self):
|
||||
def test_surrogates_error_message(self):
|
||||
def prepare():
|
||||
raise ValueError("surrogate:\uDCff")
|
||||
|
||||
|
@ -801,6 +801,28 @@ class POSIXProcessTestCase(BaseTestCase):
|
|||
else:
|
||||
self.fail("Expected ValueError or RuntimeError")
|
||||
|
||||
def test_undecodable_env(self):
|
||||
for key, value in (('test', 'abc\uDCFF'), ('test\uDCFF', '42')):
|
||||
value_repr = repr(value).encode("ascii")
|
||||
|
||||
# test str with surrogates
|
||||
script = "import os; print(repr(os.getenv(%s)))" % repr(key)
|
||||
stdout = subprocess.check_output(
|
||||
[sys.executable, "-c", script],
|
||||
env={key: value})
|
||||
stdout = stdout.rstrip(b'\n\r')
|
||||
self.assertEquals(stdout, value_repr)
|
||||
|
||||
# test bytes
|
||||
key = key.encode("ascii", "surrogateescape")
|
||||
value = value.encode("ascii", "surrogateescape")
|
||||
script = "import os; print(repr(os.getenv(%s)))" % repr(key)
|
||||
stdout = subprocess.check_output(
|
||||
[sys.executable, "-c", script],
|
||||
env={key: value})
|
||||
stdout = stdout.rstrip(b'\n\r')
|
||||
self.assertEquals(stdout, value_repr)
|
||||
|
||||
|
||||
@unittest.skipUnless(mswindows, "Windows specific tests")
|
||||
class Win32ProcessTestCase(BaseTestCase):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue