[arch-commits] Commit in python/trunk (2 files)

[Felix Yan]

    Date: Sunday, December 30, 2018 @ 07:59:09
  Author: felixonmars
Revision: 342794

upgpkg: python 3.7.2-1

Modified:
  python/trunk/PKGBUILD
Deleted:
  python/trunk/bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch

-----------------------------------------------------------------+
 PKGBUILD                                                        |    4 
 bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch |   83 ----------
 2 files changed, 2 insertions(+), 85 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-30 07:28:32 UTC (rev 342793)
+++ PKGBUILD	2018-12-30 07:59:09 UTC (rev 342794)
@@ -5,7 +5,7 @@
 # Contributor: Jason Chu <jason at archlinux.org>
 
 pkgname=python
-pkgver=3.7.1
+pkgver=3.7.2
 pkgrel=1
 _pybasever=${pkgver%.*}
 pkgdesc="Next generation of the python high-level scripting language"
@@ -25,7 +25,7 @@
 source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc}
         dont-make-libpython-readonly.patch
         0001-compileall-Fix-ddir-when-recursing.patch)
-sha512sums=('3eb62a0127609b14420a47442727702f396519c649625aca59883d04f4c02e5f37ba1d58ac8e93c49d14a63f17ae7909315c33fc813293dbcdb6127f39a148b0'
+sha512sums=('6cd2d6d8455558783b99d55985cd7b22d67b98f41a09b4fdd96f680a630a4e035220d2b903f8c59ed513aa5ffe6730fa947ddb55bb72ce36f0e945ef8af5d971'
             'SKIP'
             '2ef96708d5b13ae2a3d2cc62c87b4780e60ecfce914e190564492def3a11d5e56977659f41c7f9d12266e58050c766bce4e2b5d50b708eb792794fa8357920c4'
             'ebd04c3b6d41321b1f0d439d356e0ce463760db55dc64109854c70d017cf56608aa19de9fc4a21bf840795ff202b4703444f9af8074b661780798c17e03089ff')

Deleted: bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch
===================================================================
--- bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch	2018-12-30 07:28:32 UTC (rev 342793)
+++ bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch	2018-12-30 07:59:09 UTC (rev 342794)
@@ -1,83 +0,0 @@
-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):
-