Restore performance of special casings for utf-16 and utf-32 in TextIOWrapper

pitrou · pitrou · commit 5c398e83951f · 2011-11-13T04:11:37.000+01:00
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
@@ -725,17 +725,15 @@ ascii_encode(textio *self, PyObject *text)
 static PyObject *
 utf16be_encode(textio *self, PyObject *text)
 {
-    return PyUnicode_EncodeUTF16(PyUnicode_AS_UNICODE(text),
-                                 PyUnicode_GET_SIZE(text),
-                                 PyBytes_AS_STRING(self->errors), 1);
+    return _PyUnicode_EncodeUTF16(text,
+                                  PyBytes_AS_STRING(self->errors), 1);
 }
 
 static PyObject *
 utf16le_encode(textio *self, PyObject *text)
 {
-    return PyUnicode_EncodeUTF16(PyUnicode_AS_UNICODE(text),
-                                 PyUnicode_GET_SIZE(text),
-                                 PyBytes_AS_STRING(self->errors), -1);
+    return _PyUnicode_EncodeUTF16(text,
+                                  PyBytes_AS_STRING(self->errors), -1);
 }
 
 static PyObject *
@@ -749,25 +747,22 @@ utf16_encode(textio *self, PyObject *text)
         return utf16le_encode(self, text);
 #endif
     }
-    return PyUnicode_EncodeUTF16(PyUnicode_AS_UNICODE(text),
-                                 PyUnicode_GET_SIZE(text),
-                                 PyBytes_AS_STRING(self->errors), 0);
+    return _PyUnicode_EncodeUTF16(text,
+                                  PyBytes_AS_STRING(self->errors), 0);
 }
 
 static PyObject *
 utf32be_encode(textio *self, PyObject *text)
 {
-    return PyUnicode_EncodeUTF32(PyUnicode_AS_UNICODE(text),
-                                 PyUnicode_GET_SIZE(text),
-                                 PyBytes_AS_STRING(self->errors), 1);
+    return _PyUnicode_EncodeUTF32(text,
+                                  PyBytes_AS_STRING(self->errors), 1);
 }
 
 static PyObject *
 utf32le_encode(textio *self, PyObject *text)
 {
-    return PyUnicode_EncodeUTF32(PyUnicode_AS_UNICODE(text),
-                                 PyUnicode_GET_SIZE(text),
-                                 PyBytes_AS_STRING(self->errors), -1);
+    return _PyUnicode_EncodeUTF32(text,
+                                  PyBytes_AS_STRING(self->errors), -1);
 }
 
 static PyObject *
@@ -781,9 +776,8 @@ utf32_encode(textio *self, PyObject *text)
         return utf32le_encode(self, text);
 #endif
     }
-    return PyUnicode_EncodeUTF32(PyUnicode_AS_UNICODE(text),
-                                 PyUnicode_GET_SIZE(text),
-                                 PyBytes_AS_STRING(self->errors), 0);
+    return _PyUnicode_EncodeUTF32(text,
+                                  PyBytes_AS_STRING(self->errors), 0);
 }
 
 static PyObject *

Original file line number	Diff line number	Diff line change
`@@ -725,17 +725,15 @@ ascii_encode(textio self, PyObject text)`
`725`	`725`	`static PyObject *`
`726`	`726`	`utf16be_encode(textio self, PyObject text)`
`727`	`727`	`{`
`728`		`- return PyUnicode_EncodeUTF16(PyUnicode_AS_UNICODE(text),`
`729`		`- PyUnicode_GET_SIZE(text),`
`730`		`- PyBytes_AS_STRING(self->errors), 1);`
	`728`	`+ return _PyUnicode_EncodeUTF16(text,`
	`729`	`+ PyBytes_AS_STRING(self->errors), 1);`
`731`	`730`	`}`
`732`	`731`
`733`	`732`	`static PyObject *`
`734`	`733`	`utf16le_encode(textio self, PyObject text)`
`735`	`734`	`{`
`736`		`- return PyUnicode_EncodeUTF16(PyUnicode_AS_UNICODE(text),`
`737`		`- PyUnicode_GET_SIZE(text),`
`738`		`- PyBytes_AS_STRING(self->errors), -1);`
	`735`	`+ return _PyUnicode_EncodeUTF16(text,`
	`736`	`+ PyBytes_AS_STRING(self->errors), -1);`
`739`	`737`	`}`
`740`	`738`
`741`	`739`	`static PyObject *`
`@@ -749,25 +747,22 @@ utf16_encode(textio self, PyObject text)`
`749`	`747`	`return utf16le_encode(self, text);`
`750`	`748`	`#endif`
`751`	`749`	`}`
`752`		`- return PyUnicode_EncodeUTF16(PyUnicode_AS_UNICODE(text),`
`753`		`- PyUnicode_GET_SIZE(text),`
`754`		`- PyBytes_AS_STRING(self->errors), 0);`
	`750`	`+ return _PyUnicode_EncodeUTF16(text,`
	`751`	`+ PyBytes_AS_STRING(self->errors), 0);`
`755`	`752`	`}`
`756`	`753`
`757`	`754`	`static PyObject *`
`758`	`755`	`utf32be_encode(textio self, PyObject text)`
`759`	`756`	`{`
`760`		`- return PyUnicode_EncodeUTF32(PyUnicode_AS_UNICODE(text),`
`761`		`- PyUnicode_GET_SIZE(text),`
`762`		`- PyBytes_AS_STRING(self->errors), 1);`
	`757`	`+ return _PyUnicode_EncodeUTF32(text,`
	`758`	`+ PyBytes_AS_STRING(self->errors), 1);`
`763`	`759`	`}`
`764`	`760`
`765`	`761`	`static PyObject *`
`766`	`762`	`utf32le_encode(textio self, PyObject text)`
`767`	`763`	`{`
`768`		`- return PyUnicode_EncodeUTF32(PyUnicode_AS_UNICODE(text),`
`769`		`- PyUnicode_GET_SIZE(text),`
`770`		`- PyBytes_AS_STRING(self->errors), -1);`
	`764`	`+ return _PyUnicode_EncodeUTF32(text,`
	`765`	`+ PyBytes_AS_STRING(self->errors), -1);`
`771`	`766`	`}`
`772`	`767`
`773`	`768`	`static PyObject *`
`@@ -781,9 +776,8 @@ utf32_encode(textio self, PyObject text)`
`781`	`776`	`return utf32le_encode(self, text);`
`782`	`777`	`#endif`
`783`	`778`	`}`
`784`		`- return PyUnicode_EncodeUTF32(PyUnicode_AS_UNICODE(text),`
`785`		`- PyUnicode_GET_SIZE(text),`
`786`		`- PyBytes_AS_STRING(self->errors), 0);`
	`779`	`+ return _PyUnicode_EncodeUTF32(text,`
	`780`	`+ PyBytes_AS_STRING(self->errors), 0);`
`787`	`781`	`}`
`788`	`782`
`789`	`783`	`static PyObject *`