Whoops, how did that get in there. :-) Revert all the parts of 51227 that were not supposed to go it. Only Modules/_ctypes/cfields.c was supposed to be changed

4 files changed, 2 insertions, 22 deletions

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 8c416f1..4553838 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -123,7 +123,6 @@ option '-uall,-bsddb'.
 
 import os
 import sys
-import signal
 import getopt
 import random
 import warnings
@@ -290,12 +289,6 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, generate=False,
     if single and fromfile:
         usage(2, "-s and -f don't go together!")
 
-    def handle_signal(*args):
-        raise RuntimeError('signal received %s' % args)
-
-    # Provide a traceback if we are terminated.
-    signal.signal(signal.SIGTERM, handle_signal)
-
     good = []
     bad = []
     skipped = []
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index b972e08..1ba74c5 100644
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -486,10 +486,9 @@ function_call(PyObject *func, PyObject *arg, PyObject *kw)
 	Py_ssize_t nk, nd;
 
 	argdefs = PyFunction_GET_DEFAULTS(func);
-	/* XXX(nnorwitz): don't we know argdefs is either NULL or a tuple? */
 	if (argdefs != NULL && PyTuple_Check(argdefs)) {
 		d = &PyTuple_GET_ITEM((PyTupleObject *)argdefs, 0);
-		nd = PyTuple_GET_SIZE(argdefs);
+		nd = PyTuple_Size(argdefs);
 	}
 	else {
 		d = NULL;
@@ -518,7 +517,7 @@ function_call(PyObject *func, PyObject *arg, PyObject *kw)
 	result = PyEval_EvalCodeEx(
 		(PyCodeObject *)PyFunction_GET_CODE(func),
 		PyFunction_GET_GLOBALS(func), (PyObject *)NULL,
-		&PyTuple_GET_ITEM(arg, 0), PyTuple_GET_SIZE(arg),
+		&PyTuple_GET_ITEM(arg, 0), PyTuple_Size(arg),
 		k, nk, d, nd,
 		PyFunction_GET_CLOSURE(func));
 
diff --git a/Python/ceval.c b/Python/ceval.c
index 6d2b17f..a0e8b30 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -230,15 +230,6 @@ PyEval_InitThreads(void)
 }
 
 void
-_PyEval_FiniThreads(void)
-{
-	if (interpreter_lock)
-		PyThread_free_lock(interpreter_lock);
-	interpreter_lock = 0;
-	main_thread = 0;
-}
-
-void
 PyEval_AcquireLock(void)
 {
 	PyThread_acquire_lock(interpreter_lock, 1);
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 80f6232..88fd67c 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -60,7 +60,6 @@ static void call_sys_exitfunc(void);
 static void call_ll_exitfuncs(void);
 extern void _PyUnicode_Init(void);
 extern void _PyUnicode_Fini(void);
-extern void _PyEval_FiniThreads(void);
 
 #ifdef WITH_THREAD
 extern void _PyGILState_Init(PyInterpreterState *, PyThreadState *);
@@ -462,8 +461,6 @@ Py_Finalize(void)
 	_PyUnicode_Fini();
 #endif
 
-	_PyEval_FiniThreads();
-
 	/* XXX Still allocated:
 	   - various static ad-hoc pointers to interned strings
 	   - int and float free list blocks