Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

python2: Update to 2.7.13

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

21
python2/0200-msys2.patch
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