[arch-commits] Commit in python/trunk (2 files)
Evangelos Foutras
foutrelis at archlinux.org
Sun Jul 15 10:50:26 UTC 2018
Date: Sunday, July 15, 2018 @ 10:50:26
Author: foutrelis
Revision: 328675
upgpkg: python 3.7.0-3
Fix imp.load_module() to work with checked-hash invalidation.
Added:
python/trunk/bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch
Modified:
python/trunk/PKGBUILD
-----------------------------------------------------------------+
PKGBUILD | 13 +
bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch | 83 ++++++++++
2 files changed, 93 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-07-14 20:42:21 UTC (rev 328674)
+++ PKGBUILD 2018-07-15 10:50:26 UTC (rev 328675)
@@ -7,7 +7,7 @@
pkgname=python
pkgver=3.7.0
-pkgrel=2
+pkgrel=3
_pybasever=${pkgver%.*}
pkgdesc="Next generation of the python high-level scripting language"
arch=('x86_64')
@@ -24,9 +24,11 @@
provides=('python3')
replaces=('python3')
source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc}
+ bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch
dont-make-libpython-readonly.patch)
sha512sums=('8bb11233fb67ee9ab8ed1b72f8fdc62f66e26a6beaaeb92448bce681cf065269833b1658d3ed2459127f25ba43adb0eab73cf27c59834a2a803fb529b4216739'
'SKIP'
+ '0ec544fa95ba30be03e866d02848f9fa4921304055368609136ac39626df9835bad75506f6d81ef9fdc0ebcc29a9749f84b5b5f4dd75958c9699ade522d51b68'
'2ef96708d5b13ae2a3d2cc62c87b4780e60ecfce914e190564492def3a11d5e56977659f41c7f9d12266e58050c766bce4e2b5d50b708eb792794fa8357920c4')
validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D') # Ned Deily (Python release signing key) <nad at python.org>
@@ -33,6 +35,9 @@
prepare() {
cd Python-${pkgver}
+ # https://bugs.python.org/issue34056
+ patch -Np1 -i ../bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch
+
# FS#45809
patch -p1 -i ../dont-make-libpython-readonly.patch
@@ -74,9 +79,11 @@
check() {
# test_gdb is expected to fail with LTO
# test_idle, test_tk, test_ttk_guionly segfaults since 3.6.5
- # test_cmd_line_script, test_compileall, test_importlib, test_multiprocessing_main_handling, test_py_compile, test_runpy fail in 3.7.0
- # (All 6 are about zipfile import error)
+ # https://bugs.python.org/issue34022
+ # test_cmd_line_script, test_compileall, test_importlib,
+ # test_multiprocessing_main_handling, test_py_compile, test_runpy
+
cd Python-${pkgver}
# Obtain next free server number for xvfb-run; this even works in a chroot environment.
Added: bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch
===================================================================
--- bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch (rev 0)
+++ bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch 2018-07-15 10:50:26 UTC (rev 328675)
@@ -0,0 +1,83 @@
+From 7bd6f0e5500f778e940374237b94651f60ae1990 Mon Sep 17 00:00:00 2001
+From: "Miss Islington (bot)"
+ <31488909+miss-islington at 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 at python.org>
+---
+ Lib/imp.py | 13 ++++++-------
+ Lib/test/test_imp.py | 15 +++++++++++++++
+ 2 files changed, 21 insertions(+), 7 deletions(-)
+
+diff --git a/Lib/imp.py b/Lib/imp.py
+index 866464b245b2..31f8c766381a 100644
+--- a/Lib/imp.py
++++ b/Lib/imp.py
+@@ -142,17 +142,16 @@ def __init__(self, fullname, path, file=None):
+ def get_data(self, path):
+ """Gross hack to contort loader to deal w/ load_*()'s bad API."""
+ 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:
+ file = self.file
+- else:
+- self.file = file = open(self.path, 'r')
++ if 'b' not in file.mode:
++ file.close()
++ if self.file.closed:
++ self.file = file = open(self.path, 'rb')
+
+ 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()
+ else:
+ return super().get_data(path)
+diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
+index a115e60d4e4f..bb0144b12d41 100644
+--- a/Lib/test/test_imp.py
++++ b/Lib/test/test_imp.py
+@@ -2,6 +2,7 @@
+ 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 @@ def test_pyc_invalidation_mode_from_cmdline(self):
+ 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):
+
More information about the arch-commits
mailing list