From eea4846d23e2b6967f1e45561603652751b63fbe Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 16 Jan 2012 14:28:50 -0500 Subject: [PATCH] don't ready in case_operation, since most callers do it themselves --- Objects/unicodeobject.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 59fc1237906..648d9a06613 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); }