summaryrefslogtreecommitdiffstats
path: root/package/python/python-101-optional-pydoc.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-07-08 12:42:38 +0200
committerPeter Korsgaard <peter@korsgaard.com>2014-07-08 13:56:42 +0200
commit63c735b60a992aa5a97aba859ca8a5ba05e6af16 (patch)
tree7c76dc26ede805d818c16b21a9dfb05100bb97a1 /package/python/python-101-optional-pydoc.patch
parent9fa9cf998efea8b0c3537d9e132302b59c169dae (diff)
python: bump to version 2.7.8
The different patches are just refreshed to apply without fuzz, there are no changes/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.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/python/python-101-optional-pydoc.patch b/package/python/python-101-optional-pydoc.patch
index 7518b5e66..cb8631aff 100644
--- a/package/python/python-101-optional-pydoc.patch
+++ b/package/python/python-101-optional-pydoc.patch
@@ -40,7 +40,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2611,6 +2611,11 @@
+@@ -2624,6 +2624,11 @@
AC_CHECK_FUNCS(pthread_atfork)
fi
@@ -56,7 +56,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2217,6 +2217,12 @@
+@@ -2219,6 +2219,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],
-@@ -2237,9 +2243,7 @@
+@@ -2239,9 +2245,7 @@
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install