[arch-commits] Commit in python2/trunk (3 files)

[Stéphane Gaudreault]

    Date: Saturday, April 14, 2012 @ 19:25:58
  Author: stephane
Revision: 156165

delete patch that are no longer needed

Deleted:
  python2/trunk/13156-revert-tls-changeset-subinterpreter.patch
  python2/trunk/gdbm-magic-values.patch
  python2/trunk/linux2.patch

-------------------------------------------------+
 13156-revert-tls-changeset-subinterpreter.patch |   61 ----------------------
 gdbm-magic-values.patch                         |   12 ----
 linux2.patch                                    |   23 --------
 3 files changed, 96 deletions(-)

Deleted: 13156-revert-tls-changeset-subinterpreter.patch
===================================================================
--- 13156-revert-tls-changeset-subinterpreter.patch	2012-04-14 23:22:06 UTC (rev 156164)
+++ 13156-revert-tls-changeset-subinterpreter.patch	2012-04-14 23:25:58 UTC (rev 156165)
@@ -1,61 +0,0 @@
-
-# HG changeset patch
-# User Charles-François Natali <neologix at free.fr>
-# Date 1318446474 -7200
-# Node ID ee4fe16d9b4822457ad855ea6c44e65030166304
-# Parent  f6feed6ec3f9b024cecd0fd587595c403f55624f
-Issue #13156: revert changeset f6feed6ec3f9, which was only relevant for native
-TLS implementations, and fails with the ad-hoc TLS implementation when a thread
-doesn't have an auto thread state (e.g. a thread created outside of Python
-calling into a subinterpreter).
-
-diff --git a/Include/pystate.h b/Include/pystate.h
---- a/Include/pystate.h
-+++ b/Include/pystate.h
-@@ -111,7 +111,6 @@ PyAPI_FUNC(void) PyThreadState_Clear(PyT
- PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *);
- #ifdef WITH_THREAD
- PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void);
--PyAPI_FUNC(void) _PyGILState_Reinit(void);
- #endif
- 
- PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void);
-diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
---- a/Modules/signalmodule.c
-+++ b/Modules/signalmodule.c
-@@ -976,7 +976,6 @@ void
- PyOS_AfterFork(void)
- {
- #ifdef WITH_THREAD
--    _PyGILState_Reinit();
-     PyEval_ReInitThreads();
-     main_thread = PyThread_get_thread_ident();
-     main_pid = getpid();
-diff --git a/Python/pystate.c b/Python/pystate.c
---- a/Python/pystate.c
-+++ b/Python/pystate.c
-@@ -537,23 +537,6 @@ void
-     autoInterpreterState = NULL;
- }
- 
--/* Reset the TLS key - called by PyOS_AfterFork.
-- * This should not be necessary, but some - buggy - pthread implementations
-- * don't flush TLS on fork, see issue #10517.
-- */
--void
--_PyGILState_Reinit(void)
--{
--    PyThreadState *tstate = PyGILState_GetThisThreadState();
--    PyThread_delete_key(autoTLSkey);
--    if ((autoTLSkey = PyThread_create_key()) == -1)
--        Py_FatalError("Could not allocate TLS entry");
--
--    /* re-associate the current thread state with the new key */
--    if (PyThread_set_key_value(autoTLSkey, (void *)tstate) < 0)
--        Py_FatalError("Couldn't create autoTLSkey mapping");
--}
--
- /* When a thread state is created for a thread by some mechanism other than
-    PyGILState_Ensure, it's important that the GILState machinery knows about
-    it so it doesn't try to create another thread state for the thread (this is
-

Deleted: gdbm-magic-values.patch
===================================================================
--- gdbm-magic-values.patch	2012-04-14 23:22:06 UTC (rev 156164)
+++ gdbm-magic-values.patch	2012-04-14 23:25:58 UTC (rev 156165)
@@ -1,12 +0,0 @@
-diff -up Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic Python-2.7.2/Lib/whichdb.py
---- Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic	2011-06-11 11:46:26.000000000 -0400
-+++ Python-2.7.2/Lib/whichdb.py	2011-09-30 15:45:21.778872290 -0400
-@@ -91,7 +91,7 @@ def whichdb(filename):
-         return ""
- 
-     # Check for GNU dbm
--    if magic == 0x13579ace:
-+    if magic in (0x13579ace, 0x13579acd, 0x13579acf):
-         return "gdbm"
- 
-     # Check for old Berkeley db hash file format v2

Deleted: linux2.patch
===================================================================
--- linux2.patch	2012-04-14 23:22:06 UTC (rev 156164)
+++ linux2.patch	2012-04-14 23:25:58 UTC (rev 156165)
@@ -1,23 +0,0 @@
-http://hg.python.org/cpython/rev/c816479f6aaf/
-diff --git a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -2995,6 +2995,7 @@ then
-	MACHDEP="$ac_md_system$ac_md_release"
-
-	case $MACHDEP in
-+	linux*) MACHDEP="linux2";;
-	cygwin*) MACHDEP="cygwin";;
-	darwin*) MACHDEP="darwin";;
-	atheos*) MACHDEP="atheos";;
-diff --git a/configure.in b/configure.in
---- a/configure.in
-+++ b/configure.in
-@@ -293,6 +293,7 @@ then
-	MACHDEP="$ac_md_system$ac_md_release"
-
-	case $MACHDEP in
-+	linux*) MACHDEP="linux2";;
-	cygwin*) MACHDEP="cygwin";;
-	darwin*) MACHDEP="darwin";;
-	atheos*) MACHDEP="atheos";;