From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 16 Jan 2012 19:28:50 +0000 (-0500)
Subject: don't ready in case_operation, since most callers do it themselves
X-Git-Tag: v3.3.0a1~377
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eea4846d23e2b6967f1e45561603652751b63fbe;p=thirdparty%2FPython%2Fcpython.git

don't ready in case_operation, since most callers do it themselves
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 59fc12379066..648d9a066130 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9644,8 +9644,7 @@ case_operation(PyObject *self,
     void *data, *outdata;
     Py_UCS4 maxchar = 0, *tmp, *tmpend;
 
-    if (PyUnicode_READY(self) == -1)
-        return NULL;
+    assert(PyUnicode_IS_READY(self));
 
     kind = PyUnicode_KIND(self);
     data = PyUnicode_DATA(self);
@@ -10512,6 +10511,8 @@ characters, all remaining cased characters have lower case.");
 static PyObject*
 unicode_title(PyObject *self)
 {
+    if (PyUnicode_READY(self) == -1)
+        return NULL;
     return case_operation(self, do_title);
 }
 
@@ -12657,6 +12658,8 @@ and vice versa.");
 static PyObject*
 unicode_swapcase(PyObject *self)
 {
+    if (PyUnicode_READY(self) == -1)
+        return NULL;
     return case_operation(self, do_swapcase);
 }