python2: Update to 2.7.13

This commit is contained in:
Alexey Pavlov
2017-02-14 15:29:35 +03:00
parent e7ee376d35
commit 623b724184
3 changed files with 13 additions and 33 deletions

View File

@@ -1,16 +0,0 @@
diff -Naur a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
--- a/Modules/_sqlite/connection.c 2014-05-31 22:58:40.000000000 +0400
+++ b/Modules/_sqlite/connection.c 2014-06-04 10:16:59.812600000 +0400
@@ -783,9 +783,12 @@
}
error:
+ {
#ifdef WITH_THREAD
PyGILState_Release(threadstate);
#endif
+ ;
+ }
}
static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)

View File

@@ -238,8 +238,7 @@ diff -Naur a/configure.ac b/configure.ac
diff -Naur a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
--- a/Lib/ctypes/__init__.py 2014-05-31 22:58:38.000000000 +0400
+++ b/Lib/ctypes/__init__.py 2014-06-04 10:17:02.293000000 +0400
@@ -3,7 +3,7 @@
######################################################################
@@ -1,6 +1,6 @@
"""create and manipulate C data types in Python"""
-import os as _os, sys as _sys
@@ -352,9 +351,9 @@ diff -Naur a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
--- a/Lib/distutils/unixccompiler.py 2014-06-04 10:16:52.636600000 +0400
+++ b/Lib/distutils/unixccompiler.py 2014-06-04 10:17:02.308600000 +0400
@@ -80,7 +80,7 @@
shared_lib_extension = ".so"
dylib_lib_extension = ".dylib"
xcode_stub_lib_extension = ".tbd"
static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
xcode_stub_lib_format = dylib_lib_format
- if sys.platform == "cygwin":
+ if sys.platform in ['cygwin', 'msys']:
exe_extension = ".exe"
@@ -444,14 +443,14 @@ diff -Naur a/Lib/test/test_curses.py b/Lib/test/test_curses.py
--- a/Lib/test/test_curses.py 2014-05-31 22:58:39.000000000 +0400
+++ b/Lib/test/test_curses.py 2014-06-04 10:17:02.324200000 +0400
@@ -27,7 +27,7 @@
if not term or term == 'unknown':
raise unittest.SkipTest, "$TERM=%r, calling initscr() may cause exit" % term
# If newterm was supported we could use it instead of initscr and not exit
@unittest.skipIf(not term or term == 'unknown',
"$TERM=%r, calling initscr() may cause exit" % term)
-@unittest.skipIf(sys.platform == "cygwin",
+@unittest.skipIf(sys.platform in ["cygwin", "msys"],
"cygwin's curses mostly just hangs")
class TestCurses(unittest.TestCase):
-if sys.platform == "cygwin":
+if sys.platform in ["cygwin", "msys"]:
raise unittest.SkipTest("cygwin's curses mostly just hangs")
def window_funcs(stdscr):
diff -Naur a/Lib/test/test_dl.py b/Lib/test/test_dl.py
--- a/Lib/test/test_dl.py 2014-05-31 22:58:39.000000000 +0400
+++ b/Lib/test/test_dl.py 2014-06-04 10:17:02.339800000 +0400

View File

@@ -2,7 +2,7 @@
# Contributor: Ray Donnelly <mingw.android@gmail.com>
pkgname=python2
pkgver=2.7.11
pkgver=2.7.13
pkgrel=1
_pybasever=2.7
pkgdesc="A high-level scripting language"
@@ -25,12 +25,11 @@ source=(https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
0080-dylib.patch
0090-getpath-exe-extension.patch
0100-no-libm.patch
0120-fix-sqlite-module.patch
0200-msys2.patch
0210-reorder-bininstall-ln-symlink-creation.patch
0250-allow-win-drives-in-os-path-isabs.patch
0260-fix-sys-prefix-when-win-drive-in-argv0.patch)
sha256sums=('962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46'
sha256sums=('35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731'
'e86e0b379e4bfe99b1315979535f4b5036a65caff9e70514e0bc00556580e8e5'
'6ec74b99877088a108b762de4fadedcc16ab75edeb80caebd294ac2ea665cb58'
'1d79346eed3ea06335ec989f5557b8155192a93d083889bfa1d6b5b15e5c63d1'
@@ -41,8 +40,7 @@ sha256sums=('962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46'
'69cdcb55b2d01c97819b1647c63263e5dcff9cba79ef8fae8e704d77c8ec4e4b'
'11d3c071f35af9ab61a78b943b57ec62f447213c95005663c0a703be9cc65d63'
'd502dc1264960b97be268bfa94d3ce0f1736813dd4351035a396fdf92fe54a96'
'8aeef2f062d86981eac5974439c9ba4d3b24360f2618ebe342570d2e269fda07'
'1dc11b74a0c9b29cb1e396d2852c92cbff4e8715598808e0e53e3bb953ef6258'
'fe2edaf223fbbac93b9887cc1cf0e5b5c4699c75c4f4dbe34039573adba889c6'
'6b3a10ad0e00148073b0a7213b3ad84e8da8461429347b2c2acb84444c003874'
'555949be83449ff94d9f70a41d6b526f5861edcd97e2a8375394e44b75524776'
'1bf60a68e8c424a4f60cd8c6e7e0d5adbe276fb1a0ce1a35466384aab7476f06')
@@ -60,7 +58,6 @@ prepare() {
patch -p1 -i ${srcdir}/0080-dylib.patch
patch -p1 -i ${srcdir}/0090-getpath-exe-extension.patch
patch -p1 -i ${srcdir}/0100-no-libm.patch
patch -p1 -i ${srcdir}/0120-fix-sqlite-module.patch
patch -p1 -i ${srcdir}/0200-msys2.patch
patch -p1 -i ${srcdir}/0210-reorder-bininstall-ln-symlink-creation.patch
patch -p1 -i ${srcdir}/0250-allow-win-drives-in-os-path-isabs.patch