Move test code out of xxmodule and into _testcapimodule.c where it belongs.

Will backport.

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 913c49aba72cdb28f2ae9e40ef4cf48e4b662022..6d8ea3c6693c82b8ab3122cb979bb59eceecc304 100644 (file)
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -522,6 +522,18 @@ test_long_numbits(PyObject *self)
        return Py_None;
 }
 
+/* Example passing NULLs to PyObject_Str(NULL) and PyObject_Unicode(NULL). */
+
+static PyObject *
+test_null_strings(PyObject *self)
+{
+       PyObject *o1 = PyObject_Str(NULL), *o2 = PyObject_Unicode(NULL);
+       PyObject *tuple = PyTuple_Pack(2, o1, o2);
+       Py_XDECREF(o1);
+       Py_XDECREF(o2);
+       return tuple;
+}
+
 static PyObject *
 raise_exception(PyObject *self, PyObject *args)
 {
@@ -597,6 +609,7 @@ static PyMethodDef TestMethods[] = {
        {"test_long_api",       (PyCFunction)test_long_api,      METH_NOARGS},
        {"test_long_numbits",   (PyCFunction)test_long_numbits,  METH_NOARGS},
        {"test_k_code",         (PyCFunction)test_k_code,        METH_NOARGS},
+       {"test_null_strings",   (PyCFunction)test_null_strings,  METH_NOARGS},
 
        {"getargs_b",           (PyCFunction)getargs_b,          METH_VARARGS},
        {"getargs_B",           (PyCFunction)getargs_B,          METH_VARARGS},

diff --git a/Modules/xxmodule.c b/Modules/xxmodule.c
index df312eb72a147bf3457f178b7d246e0b3f9528e4..ea66eefa0a6829f0755021b76c7e2031289e5eda 100644 (file)
--- a/Modules/xxmodule.c
+++ b/Modules/xxmodule.c
@@ -197,18 +197,6 @@ xx_bug(PyObject *self, PyObject *args)
        return Py_None;
 }
 
-/* Example passing NULLs to PyObject_Str(NULL) and PyObject_Unicode(NULL). */
-
-static PyObject *
-xx_null(PyObject *self, PyObject *noargs)
-{
-       PyObject *o1 = PyObject_Str(NULL), *o2 = PyObject_Unicode(NULL);
-       PyObject *tuple = PyTuple_Pack(2, o1, o2);
-       Py_XDECREF(o1);
-       Py_XDECREF(o2);
-       return tuple;
-}
-
 /* Test bad format character */
 
 static PyObject *
@@ -343,8 +331,6 @@ static PyMethodDef xx_methods[] = {
                PyDoc_STR("new() -> new Xx object")},
        {"bug",         xx_bug,         METH_VARARGS,
                PyDoc_STR("bug(o) -> None")},
-       {"null",        xx_null,        METH_NOARGS,
-               PyDoc_STR("null(o) -> ('NULL', u'NULL')")},
        {NULL,          NULL}           /* sentinel */
 };