merge 3.2

This commit is contained in:
Benjamin Peterson 2012-03-25 22:41:16 -04:00
commit c067d6661f
1 changed files with 0 additions and 4 deletions

View File

@ -13173,10 +13173,6 @@ unicode_getnewargs(PyObject *v)
} }
static PyMethodDef unicode_methods[] = { static PyMethodDef unicode_methods[] = {
/* Order is according to common usage: often used methods should
appear first, since lookup is done sequentially. */
{"encode", (PyCFunction) unicode_encode, METH_VARARGS | METH_KEYWORDS, encode__doc__}, {"encode", (PyCFunction) unicode_encode, METH_VARARGS | METH_KEYWORDS, encode__doc__},
{"replace", (PyCFunction) unicode_replace, METH_VARARGS, replace__doc__}, {"replace", (PyCFunction) unicode_replace, METH_VARARGS, replace__doc__},
{"split", (PyCFunction) unicode_split, METH_VARARGS | METH_KEYWORDS, split__doc__}, {"split", (PyCFunction) unicode_split, METH_VARARGS | METH_KEYWORDS, split__doc__},