diff -r cd3fdf21a6e4 Modules/_sre.c --- a/Modules/_sre.c Thu Jan 16 14:15:03 2014 -0800 +++ b/Modules/_sre.c Fri Jan 17 12:10:59 2014 +0200 @@ -533,7 +533,7 @@ _sre.SRE_Pattern.match as pattern_match self: self(type="PatternObject *") - pattern: object + string: object pos: Py_ssize_t = 0 endpos: Py_ssize_t(c_default="PY_SSIZE_T_MAX") = sys.maxsize @@ -541,43 +541,42 @@ [clinic start generated code]*/ PyDoc_STRVAR(pattern_match__doc__, -"match(pattern, pos=0, endpos=sys.maxsize)\n" +"match(string, pos=0, endpos=sys.maxsize)\n" "Matches zero or more characters at the beginning of the string."); #define PATTERN_MATCH_METHODDEF \ {"match", (PyCFunction)pattern_match, METH_VARARGS|METH_KEYWORDS, pattern_match__doc__}, static PyObject * -pattern_match_impl(PatternObject *self, PyObject *pattern, Py_ssize_t pos, Py_ssize_t endpos); +pattern_match_impl(PatternObject *self, PyObject *string, Py_ssize_t pos, Py_ssize_t endpos); static PyObject * pattern_match(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *return_value = NULL; - static char *_keywords[] = {"pattern", "pos", "endpos", NULL}; - PyObject *pattern; + static char *_keywords[] = {"string", "pos", "endpos", NULL}; + PyObject *string; Py_ssize_t pos = 0; Py_ssize_t endpos = PY_SSIZE_T_MAX; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|nn:match", _keywords, - &pattern, &pos, &endpos)) + &string, &pos, &endpos)) goto exit; - return_value = pattern_match_impl((PatternObject *)self, pattern, pos, endpos); + return_value = pattern_match_impl((PatternObject *)self, string, pos, endpos); exit: return return_value; } static PyObject * -pattern_match_impl(PatternObject *self, PyObject *pattern, Py_ssize_t pos, Py_ssize_t endpos) -/*[clinic end generated code: checksum=63e59c5f3019efe6c1f3acdec42b2d3595e14a09]*/ +pattern_match_impl(PatternObject *self, PyObject *string, Py_ssize_t pos, Py_ssize_t endpos) +/*[clinic end generated code: checksum=7d11a49f87c55ed017b22d8ffb8654516f54247c]*/ { SRE_STATE state; Py_ssize_t status; - PyObject *string; - - string = state_init(&state, (PatternObject *)self, pattern, pos, endpos); + + string = state_init(&state, (PatternObject *)self, string, pos, endpos); if (!string) return NULL; @@ -605,7 +604,7 @@ PyObject* string; Py_ssize_t start = 0; Py_ssize_t end = PY_SSIZE_T_MAX; - static char* kwlist[] = { "pattern", "pos", "endpos", NULL }; + static char* kwlist[] = { "string", "pos", "endpos", NULL }; if (!PyArg_ParseTupleAndKeywords(args, kw, "O|nn:fullmatch", kwlist, &string, &start, &end)) return NULL; @@ -639,7 +638,7 @@ PyObject* string; Py_ssize_t start = 0; Py_ssize_t end = PY_SSIZE_T_MAX; - static char* kwlist[] = { "pattern", "pos", "endpos", NULL }; + static char* kwlist[] = { "string", "pos", "endpos", NULL }; if (!PyArg_ParseTupleAndKeywords(args, kw, "O|nn:search", kwlist, &string, &start, &end)) return NULL;