Remove PyArg_NoArgs() and PyArg_GetInt()
diff --git a/Include/Python.h b/Include/Python.h
index 8df7dbc..161c838 100644
--- a/Include/Python.h
+++ b/Include/Python.h
@@ -131,13 +131,6 @@
/* _Py_Mangle is defined in compile.c */
PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name);
-/* PyArg_GetInt is deprecated and should not be used, use PyArg_Parse(). */
-#define PyArg_GetInt(v, a) PyArg_Parse((v), "i", (a))
-
-/* PyArg_NoArgs should not be necessary.
- Set ml_flags in the PyMethodDef to METH_NOARGS. */
-#define PyArg_NoArgs(v) PyArg_Parse(v, "")
-
/* Convert a possibly signed character to a nonnegative int */
/* XXX This assumes characters are 8 bits wide */
#ifdef __CHAR_UNSIGNED__
diff --git a/Modules/cstubs b/Modules/cstubs
index 53bd4ab..c8c7dd5 100644
--- a/Modules/cstubs
+++ b/Modules/cstubs
@@ -472,8 +472,6 @@
{
PyObject *v, *w;
int i, nhits, n;
- if (!PyArg_NoArgs(args))
- return NULL;
if (pickbuffer == NULL) {
PyErr_SetString(PyExc_RuntimeError,
"endpick/endselect: not in pick/select mode");
diff --git a/RISCOS/Modules/riscosmodule.c b/RISCOS/Modules/riscosmodule.c
index 55f189d..2ad4499 100644
--- a/RISCOS/Modules/riscosmodule.c
+++ b/RISCOS/Modules/riscosmodule.c
@@ -79,7 +79,7 @@
}
static PyObject *riscos_getcwd(PyObject *self,PyObject *args)
-{ if(!PyArg_NoArgs(args)) return NULL;
+{
return canon("@");
}
@@ -354,7 +354,7 @@
{"system", riscos_system},
{"rmdir", riscos_remove},
{"chdir", riscos_chdir},
- {"getcwd", riscos_getcwd},
+ {"getcwd", riscos_getcwd, METH_NOARGS},
{"expand", riscos_expand},
{"mkdir", riscos_mkdir,1},
{"listdir", riscos_listdir},