mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 08:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Remove METH_OLDARGS:

Browse source 
Convert METH_OLDARGS -> METH_VARARGS: also PyArg_Parse -> PyArg_ParseTuple
  Convert METH_OLDARGS -> METH_NOARGS: remove args parameter
Please review.  All tests pass, but some modules don't have tests.
I spot checked various functions to try to make sure nothing broke.
This commit is contained in:
Neal Norwitz 2002-03-31 15:27:00 +00:00
parent 50905b557b
commit ba3a16c6c3
11 changed files with 85 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Modules/regexmodule.c
View file

@ -583,7 +583,7 @@ regex_match(PyObject *self, PyObject *args)
PyObject *pat, *string;
PyObject *tuple, *v;
if (!PyArg_Parse(args, "(SS)", &pat, &string))
if (!PyArg_ParseTuple(args, "SS:match", &pat, &string))
return NULL;
if (update_cache(pat) < 0)
return NULL;
@ -601,7 +601,7 @@ regex_search(PyObject *self, PyObject *args)
PyObject *pat, *string;
PyObject *tuple, *v;
if (!PyArg_Parse(args, "(SS)", &pat, &string))
if (!PyArg_ParseTuple(args, "SS:search", &pat, &string))
return NULL;
if (update_cache(pat) < 0)
return NULL;
@ -617,7 +617,7 @@ static PyObject *
regex_set_syntax(PyObject *self, PyObject *args)
{
int syntax;
if (!PyArg_Parse(args, "i", &syntax))
if (!PyArg_ParseTuple(args, "i:set_syntax", &syntax))
return NULL;
syntax = re_set_syntax(syntax);
/* wipe the global pattern cache */
@ -629,10 +629,8 @@ regex_set_syntax(PyObject *self, PyObject *args)
}
static PyObject *
regex_get_syntax(PyObject *self, PyObject *args)
regex_get_syntax(PyObject *self)
{
if (!PyArg_Parse(args, ""))
return NULL;
return PyInt_FromLong((long)re_syntax);
}
@ -640,10 +638,10 @@ regex_get_syntax(PyObject *self, PyObject *args)
static struct PyMethodDef regex_global_methods[] = {
{"compile", regex_compile, METH_VARARGS},
{"symcomp", regex_symcomp, METH_VARARGS},
{"match", regex_match, METH_OLDARGS},
{"search", regex_search, METH_OLDARGS},
{"set_syntax", regex_set_syntax, METH_OLDARGS},
{"get_syntax", regex_get_syntax, METH_OLDARGS},
{"match", regex_match, METH_VARARGS},
{"search", regex_search, METH_VARARGS},
{"set_syntax", regex_set_syntax, METH_VARARGS},
{"get_syntax", (PyCFunction)regex_get_syntax, METH_NOARGS},
{NULL, NULL} /* sentinel */
};