diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-07-07 04:00:45 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-07 04:00:45 (GMT) |
commit | 7bd6f0e5500f778e940374237b94651f60ae1990 (patch) | |
tree | a3200c2fce1d51d88a51eb44bd09fc9522df83cf /Lib/test/test_imp.py | |
parent | 127bd9bfd591c8ec1a97eb7f4037c8b884eef973 (diff) | |
download | cpython-7bd6f0e5500f778e940374237b94651f60ae1990.zip cpython-7bd6f0e5500f778e940374237b94651f60ae1990.tar.gz cpython-7bd6f0e5500f778e940374237b94651f60ae1990.tar.bz2 |
closes bpo-34056: Always return bytes from _HackedGetData.get_data(). (GH-8130)
* Always return bytes from _HackedGetData.get_data().
Ensure the imp.load_source shim always returns bytes by reopening the file in
binary mode if needed. Hash-based pycs have to receive the source code in bytes.
It's tempting to change imp.get_suffixes() to always return 'rb' as a mode, but
that breaks some stdlib tests and likely 3rdparty code, too.
(cherry picked from commit b0274f2cddd36b49fe5080efbe160277ef546471)
Co-authored-by: Benjamin Peterson <benjamin@python.org>
Diffstat (limited to 'Lib/test/test_imp.py')
-rw-r--r-- | Lib/test/test_imp.py | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py index a115e60..bb0144b 100644 --- a/Lib/test/test_imp.py +++ b/Lib/test/test_imp.py @@ -2,6 +2,7 @@ import importlib import importlib.util import os import os.path +import py_compile import sys from test import support from test.support import script_helper @@ -350,6 +351,20 @@ class ImportTests(unittest.TestCase): res = script_helper.assert_python_ok(*args) self.assertEqual(res.out.strip().decode('utf-8'), expected) + def test_find_and_load_checked_pyc(self): + # issue 34056 + with support.temp_cwd(): + with open('mymod.py', 'wb') as fp: + fp.write(b'x = 42\n') + py_compile.compile( + 'mymod.py', + doraise=True, + invalidation_mode=py_compile.PycInvalidationMode.CHECKED_HASH, + ) + file, path, description = imp.find_module('mymod', path=['.']) + mod = imp.load_module('mymod', file, path, description) + self.assertEqual(mod.x, 42) + class ReloadTests(unittest.TestCase): |