From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 26 Mar 2012 02:41:16 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a2~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c067d6661f1c5fc772753a34946aa18829ad04c0;p=python

merge 3.2
---

c067d6661f1c5fc772753a34946aa18829ad04c0
diff --cc Objects/unicodeobject.c
index 5c1071325d,a5ffc56260..704de813e8
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@@ -13173,17 -9208,12 +13173,13 @@@ unicode_getnewargs(PyObject *v
  }
  
  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__},
      {"replace", (PyCFunction) unicode_replace, METH_VARARGS, replace__doc__},
 -    {"split", (PyCFunction) unicode_split, METH_VARARGS, split__doc__},
 -    {"rsplit", (PyCFunction) unicode_rsplit, METH_VARARGS, rsplit__doc__},
 +    {"split", (PyCFunction) unicode_split, METH_VARARGS | METH_KEYWORDS, split__doc__},
 +    {"rsplit", (PyCFunction) unicode_rsplit, METH_VARARGS | METH_KEYWORDS, rsplit__doc__},
      {"join", (PyCFunction) unicode_join, METH_O, join__doc__},
      {"capitalize", (PyCFunction) unicode_capitalize, METH_NOARGS, capitalize__doc__},
 +    {"casefold", (PyCFunction) unicode_casefold, METH_NOARGS, casefold__doc__},
      {"title", (PyCFunction) unicode_title, METH_NOARGS, title__doc__},
      {"center", (PyCFunction) unicode_center, METH_VARARGS, center__doc__},
      {"count", (PyCFunction) unicode_count, METH_VARARGS, count__doc__},