Rename the test_traceback_print() function to traceback_print() to prevent

test_capi from automatically calling the function.

diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index a3a5e394a51bd4aad737e8274beaf11a701466d1..96b8938d3650ea712bc4b9859427557d3f3b6072 100644 (file)
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -1,6 +1,6 @@
 """Test cases for traceback module"""
 
-from _testcapi import test_traceback_print
+from _testcapi import traceback_print
 from StringIO import StringIO
 import sys
 import unittest
@@ -13,7 +13,7 @@ try:
 except KeyError:
     type_, value, tb = sys.exc_info()
     file_ = StringIO()
-    test_traceback_print(tb, file_)
+    traceback_print(tb, file_)
     example_traceback = file_.getvalue()
 else:
     raise Error("unable to create test traceback string")

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 8b4dbce60aec4e27773e62c2f60ffaa28d1fbe30..4a00fb1975bfbf0125dcf7b1082932871f23b0ee 100644 (file)
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -736,13 +736,13 @@ test_with_docstring(PyObject *self)
 
 /* To test the format of tracebacks as printed out. */
 static PyObject *
-test_traceback_print(PyObject *self, PyObject *args)
+traceback_print(PyObject *self, PyObject *args)
 {
        PyObject *file;
        PyObject *traceback;
        int result;
        
-       if (!PyArg_ParseTuple(args, "OO:test_traceback_print",
+       if (!PyArg_ParseTuple(args, "OO:traceback_print",
                                &traceback, &file))
                return NULL;
                
@@ -792,7 +792,7 @@ static PyMethodDef TestMethods[] = {
 #ifdef WITH_THREAD
        {"_test_thread_state",  test_thread_state,               METH_VARARGS},
 #endif
-       {"test_traceback_print", test_traceback_print,           METH_VARARGS},
+       {"traceback_print", traceback_print,             METH_VARARGS},
        {NULL, NULL} /* sentinel */
 };