Unverified Kaydet (Commit) b0274f2c authored tarafından Benjamin Peterson's avatar Benjamin Peterson Kaydeden (comit) GitHub

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.
üst e25399b4
...@@ -142,17 +142,16 @@ class _HackedGetData: ...@@ -142,17 +142,16 @@ class _HackedGetData:
def get_data(self, path): def get_data(self, path):
"""Gross hack to contort loader to deal w/ load_*()'s bad API.""" """Gross hack to contort loader to deal w/ load_*()'s bad API."""
if self.file and path == self.path: if self.file and path == self.path:
# The contract of get_data() requires us to return bytes. Reopen the
# file in binary mode if needed.
if not self.file.closed: if not self.file.closed:
file = self.file file = self.file
else: if 'b' not in file.mode:
self.file = file = open(self.path, 'r') file.close()
if self.file.closed:
self.file = file = open(self.path, 'rb')
with file: with file:
# Technically should be returning bytes, but
# SourceLoader.get_code() just passed what is returned to
# compile() which can handle str. And converting to bytes would
# require figuring out the encoding to decode to and
# tokenize.detect_encoding() only accepts bytes.
return file.read() return file.read()
else: else:
return super().get_data(path) return super().get_data(path)
......
...@@ -2,6 +2,7 @@ import importlib ...@@ -2,6 +2,7 @@ import importlib
import importlib.util import importlib.util
import os import os
import os.path import os.path
import py_compile
import sys import sys
from test import support from test import support
from test.support import script_helper from test.support import script_helper
...@@ -350,6 +351,20 @@ class ImportTests(unittest.TestCase): ...@@ -350,6 +351,20 @@ class ImportTests(unittest.TestCase):
res = script_helper.assert_python_ok(*args) res = script_helper.assert_python_ok(*args)
self.assertEqual(res.out.strip().decode('utf-8'), expected) 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): class ReloadTests(unittest.TestCase):
......
Ensure the loader shim created by ``imp.load_module`` always returns bytes
from its ``get_data()`` function. This fixes using ``imp.load_module`` with
:pep:`552` hash-based pycs.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment