From 4d9ae3daf608f1a1ee4afe8e69043b5a06443a37 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 28 Jun 2014 23:52:21 +0200 Subject: python: bump to Python 2.7.7 Status of patches: - python-013-fix-readline-6.3.patch is removed, as it was a backport from an upstream fix. - all other patches are updated, with no special changes other than solving minor conflicts. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/python/python-102-optional-2to3.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'package/python/python-102-optional-2to3.patch') diff --git a/package/python/python-102-optional-2to3.patch b/package/python/python-102-optional-2to3.patch index 586b24b42..3503f8c0c 100644 --- a/package/python/python-102-optional-2to3.patch +++ b/package/python/python-102-optional-2to3.patch @@ -16,24 +16,24 @@ Index: b/Makefile.pre.in =================================================================== --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -941,7 +941,6 @@ +@@ -934,7 +934,6 @@ json \ sqlite3 \ logging bsddb csv importlib wsgiref \ - lib2to3 lib2to3/fixes lib2to3/pgen2 \ - ctypes ctypes/macholib idlelib idlelib/Icons \ + ctypes ctypes/macholib \ + idlelib idlelib/Icons \ distutils distutils/command $(XMLLIBSUBDIRS) \ - multiprocessing multiprocessing/dummy \ -@@ -958,8 +957,6 @@ +@@ -953,8 +952,6 @@ json/tests \ sqlite3/test \ bsddb/test \ - lib2to3/tests \ - lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \ ctypes/test \ + idlelib/idle_test \ distutils/tests \ - unittest/test -@@ -972,6 +969,14 @@ +@@ -968,6 +965,14 @@ LIBSUBDIRS += pydoc_data endif @@ -52,7 +52,7 @@ Index: b/configure.ac =================================================================== --- a/configure.ac +++ b/configure.ac -@@ -2625,6 +2625,12 @@ +@@ -2623,6 +2623,12 @@ AS_HELP_STRING([--disable-test-modules], [disable test modules]), [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) @@ -69,7 +69,7 @@ Index: b/setup.py =================================================================== --- a/setup.py +++ b/setup.py -@@ -2206,10 +2206,11 @@ +@@ -2218,10 +2218,11 @@ import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) -- cgit v1.2.3