[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/51016ff7f8c9
changeset:   75942:51016ff7f8c9
parent:      75939:f8d01c8baf6a
parent:      75941:66117d4bb586
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Mar 25 22:41:16 2012 -0400
summary:
  merge 3.2

files:
  Objects/unicodeobject.c |  4 ----
  1 files changed, 0 insertions(+), 4 deletions(-)


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -13173,10 +13173,6 @@
 }
 
 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 | METH_KEYWORDS, split__doc__},

-- 
Repository URL: http://hg.python.org/cpython