forked from pool/python310
- Remove python3-imp-returntype.patch which has been upstreamed.
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python310?expand=0&rev=3
This commit is contained in:
parent
f74f5f6179
commit
215e2ebbfe
@ -1,52 +0,0 @@
|
||||
From 7bd6f0e5500f778e940374237b94651f60ae1990 Mon Sep 17 00:00:00 2001
|
||||
From: "Miss Islington (bot)"
|
||||
<31488909+miss-islington@users.noreply.github.com>
|
||||
Date: Fri, 6 Jul 2018 21:00:45 -0700
|
||||
Subject: [PATCH] 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>
|
||||
---
|
||||
Lib/test/test_imp.py | 14 ++++++++++
|
||||
Misc/NEWS.d/next/Library/2018-07-05-22-45-46.bpo-34056.86isrU.rst | 3 ++
|
||||
2 files changed, 17 insertions(+)
|
||||
create mode 100644 Misc/NEWS.d/next/Library/2018-07-05-22-45-46.bpo-34056.86isrU.rst
|
||||
|
||||
--- a/Lib/test/test_imp.py
|
||||
+++ b/Lib/test/test_imp.py
|
||||
@@ -378,6 +378,20 @@ class ImportTests(unittest.TestCase):
|
||||
mod = imp.load_module('mymod', file, path, description)
|
||||
self.assertEqual(mod.x, 42)
|
||||
|
||||
+ 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):
|
||||
|
||||
--- /dev/null
|
||||
+++ b/Misc/NEWS.d/next/Library/2018-07-05-22-45-46.bpo-34056.86isrU.rst
|
||||
@@ -0,0 +1,3 @@
|
||||
+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.
|
@ -3,6 +3,7 @@ Wed Jul 21 13:44:48 UTC 2021 - Matej Cepl <mcepl@suse.com>
|
||||
|
||||
- Update to 3.10.0b4:
|
||||
https://docs.python.org/3.10/whatsnew/changelog.html#python-3-10-0-beta-4
|
||||
- Remove python3-imp-returntype.patch which has been upstreamed.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 7 15:52:44 UTC 2021 - Matej Cepl <mcepl@suse.com>
|
||||
|
@ -133,7 +133,6 @@ Patch08: python-3.3.0b1-fix_date_time_compiler.patch
|
||||
Patch09: python-3.3.0b1-test-posix_fadvise.patch
|
||||
# Raise timeout value for test_subprocess
|
||||
Patch15: subprocess-raise-timeout.patch
|
||||
Patch25: python3-imp-returntype.patch
|
||||
# PATCH-FEATURE-UPSTREAM bpo-31046_ensurepip_honours_prefix.patch bpo#31046 mcepl@suse.com
|
||||
# ensurepip should honour the value of $(prefix)
|
||||
Patch29: bpo-31046_ensurepip_honours_prefix.patch
|
||||
@ -380,7 +379,6 @@ other applications.
|
||||
%patch08 -p1
|
||||
%patch09 -p1
|
||||
%patch15 -p1
|
||||
%patch25 -p1
|
||||
%patch29 -p1
|
||||
%if 0%{?suse_version} <= 1500
|
||||
%patch33 -p1
|
||||
|
Loading…
Reference in New Issue
Block a user