]> granicus.if.org Git - python/commitdiff
Change PyUnicode_EncodeUTF16() so that it returns
authorWalter Dörwald <walter@livinglogic.de>
Fri, 4 May 2007 10:48:27 +0000 (10:48 +0000)
committerWalter Dörwald <walter@livinglogic.de>
Fri, 4 May 2007 10:48:27 +0000 (10:48 +0000)
bytes objects instead of str8 objects.

Objects/unicodeobject.c

index d4a17ce43bb44e4f4dc19ff60dcb7d94dcaa69dc..45c52cc77c1649a8159cd3596cd759c3e254faa2 100644 (file)
@@ -1726,12 +1726,12 @@ PyUnicode_EncodeUTF16(const Py_UNICODE *s,
        if (s[i] >= 0x10000)
            pairs++;
 #endif
-    v = PyString_FromStringAndSize(NULL,
+    v = PyBytes_FromStringAndSize(NULL,
                  2 * (size + pairs + (byteorder == 0)));
     if (v == NULL)
         return NULL;
 
-    p = (unsigned char *)PyString_AS_STRING(v);
+    p = (unsigned char *)PyBytes_AS_STRING(v);
     if (byteorder == 0)
        STORECHAR(0xFEFF);
     if (size == 0)