diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-06-28 23:52:21 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-07-01 14:57:00 +0200 |
| commit | 4d9ae3daf608f1a1ee4afe8e69043b5a06443a37 (patch) | |
| tree | f28f132433579407f9043f8c59236d4939fb32a8 /package/python/python-101-optional-pydoc.patch | |
| parent | e5573e723695a830c05ae7a2649d811abc6b5061 (diff) | |
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 <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/python/python-101-optional-pydoc.patch')
| -rw-r--r-- | package/python/python-101-optional-pydoc.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/python/python-101-optional-pydoc.patch b/package/python/python-101-optional-pydoc.patch index c9b05bd76..7518b5e66 100644 --- a/package/python/python-101-optional-pydoc.patch +++ b/package/python/python-101-optional-pydoc.patch @@ -16,7 +16,7 @@ Index: b/Makefile.pre.in =================================================================== --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -947,7 +947,7 @@ +@@ -941,7 +941,7 @@ multiprocessing multiprocessing/dummy \ unittest \ lib-old \ @@ -24,8 +24,8 @@ Index: b/Makefile.pre.in + curses $(MACHDEPS) TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ - lib-tk/test/test_ttk \ -@@ -968,6 +968,10 @@ + lib-tk/test/test_ttk test test/audiodata test/data \ +@@ -964,6 +964,10 @@ LIBSUBDIRS += $(TESTSUBDIRS) endif @@ -40,7 +40,7 @@ Index: b/configure.ac =================================================================== --- a/configure.ac +++ b/configure.ac -@@ -2613,6 +2613,11 @@ +@@ -2611,6 +2611,11 @@ AC_CHECK_FUNCS(pthread_atfork) fi @@ -56,7 +56,7 @@ Index: b/setup.py =================================================================== --- a/setup.py +++ b/setup.py -@@ -2205,6 +2205,12 @@ +@@ -2217,6 +2217,12 @@ # turn off warnings when deprecated modules are imported import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -69,7 +69,7 @@ Index: b/setup.py setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0], -@@ -2225,9 +2231,7 @@ +@@ -2237,9 +2243,7 @@ ext_modules=[Extension('_struct', ['_struct.c'])], # Scripts to install |