Unicode implementation by Marc-Andre Lemburg based on original code by

Fredrik Lundh.

1 files changed, 4440 insertions, 0 deletions

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
new file mode 100644
index 0000000..b9223eb
--- /dev/null
+++ b/Objects/unicodeobject.c
@@ -0,0 +1,4440 @@
+/* 
+
+Unicode implementation based on original code by Fredrik Lundh,
+modified by Marc-Andre Lemburg (mal@lemburg.com) according to the
+Unicode Integration Proposal (see file Misc/unicode.txt).
+
+(c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
+
+
+ Original header:
+ --------------------------------------------------------------------
+
+ * Yet another Unicode string type for Python.  This type supports the
+ * 16-bit Basic Multilingual Plane (BMP) only.
+ *
+ * Note that this string class supports embedded NULL characters.  End
+ * of string is given by the length attribute.  However, the internal
+ * representation always stores a trailing NULL to make it easier to
+ * use unicode strings with standard APIs.
+ *
+ * History:
+ * 1999-01-23 fl  Created
+ * 1999-01-24 fl  Added split, join, capwords; basic UTF-8 support
+ * 1999-01-24 fl  Basic UCS-2 support, buffer interface, etc.
+ * 1999-03-06 fl  Moved declarations to separate file, etc.
+ * 1999-06-13 fl  Changed join method semantics according to Tim's proposal
+ * 1999-08-10 fl  Some minor tweaks
+ *
+ * Written by Fredrik Lundh, January 1999.
+ *
+ * Copyright (c) 1999 by Secret Labs AB.
+ * Copyright (c) 1999 by Fredrik Lundh.
+ *
+ * fredrik@pythonware.com
+ * http://www.pythonware.com
+ *
+ * --------------------------------------------------------------------
+ * This Unicode String Type is
+ * 
+ * Copyright (c) 1999 by Secret Labs AB
+ * Copyright (c) 1999 by Fredrik Lundh
+ * 
+ * By obtaining, using, and/or copying this software and/or its
+ * associated documentation, you agree that you have read, understood,
+ * and will comply with the following terms and conditions:
+ * 
+ * Permission to use, copy, modify, and distribute this software and its
+ * associated documentation for any purpose and without fee is hereby
+ * granted, provided that the above copyright notice appears in all
+ * copies, and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of Secret Labs
+ * AB or the author not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission.
+ * 
+ * SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * -------------------------------------------------------------------- */
+
+#include "Python.h"
+
+#include "mymath.h"
+#include "unicodeobject.h"
+
+#if defined(HAVE_LIMITS_H)
+#include <limits.h>
+#else
+#define INT_MAX 2147483647
+#endif
+
+/* Limit for the Unicode object free list */
+
+#define MAX_UNICODE_FREELIST_SIZE       1024
+
+/* Limit for the Unicode object free list stay alive optimization.
+
+   The implementation will keep allocated Unicode memory intact for
+   all objects on the free list having a size less than this
+   limit. This reduces malloc() overhead for small Unicode objects.  
+
+   At worse this will result in MAX_UNICODE_FREELIST_SIZE *
+   (sizeof(PyUnicodeObject) + STAYALIVE_SIZE_LIMIT +
+   malloc()-overhead) bytes of unused garbage.
+
+   Setting the limit to 0 effectively turns the feature off.
+
+   XXX The feature is currently turned off because there are
+       apparently some lingering bugs in its implementation which I
+       haven't yet been able to sort out.
+
+*/
+
+#define STAYALIVE_SIZE_LIMIT       0
+
+/* Endianness switches; defaults to little endian */
+
+#ifdef WORDS_BIGENDIAN
+# define BYTEORDER_IS_BIG_ENDIAN
+#else
+# define BYTEORDER_IS_LITTLE_ENDIAN
+#endif
+
+/* --- Globals ------------------------------------------------------------ */
+
+/* The empty Unicode object */
+static PyUnicodeObject *unicode_empty = NULL;
+
+/* Free list for Unicode objects */
+static PyUnicodeObject *unicode_freelist = NULL;
+static int unicode_freelist_size = 0;
+
+/* --- Unicode Object ----------------------------------------------------- */
+
+static
+int _PyUnicode_Resize(register PyUnicodeObject *unicode,
+                      int length)
+{
+    void *oldstr;
+    
+    /* Shortcut if there's nothing to do. */
+    if (unicode->length == length)
+	return 0;
+
+    /* Resizing unicode_empty is not allowed. */
+    if (unicode == unicode_empty) {
+        PyErr_SetString(PyExc_SystemError,
+                        "can't resize empty unicode object");
+        return -1;
+    }
+
+    /* We allocate one more byte to make sure the string is
+       Ux0000 terminated -- XXX is this needed ? */
+    oldstr = unicode->str;
+    PyMem_RESIZE(unicode->str, Py_UNICODE, length + 1);
+    if (!unicode->str) {
+	unicode->str = oldstr;
+        PyErr_NoMemory();
+        return -1;
+    }
+    unicode->str[length] = 0;
+    unicode->length = length;
+
+    /* Reset the object caches */
+    if (unicode->utf8str) {
+        Py_DECREF(unicode->utf8str);
+        unicode->utf8str = NULL;
+    }
+    unicode->hash = -1;
+    
+    return 0;
+}
+
+/* We allocate one more byte to make sure the string is
+   Ux0000 terminated -- XXX is this needed ? 
+
+   XXX This allocator could further be enhanced by assuring that the
+       free list never reduces its size below 1.
+
+*/
+
+static
+PyUnicodeObject *_PyUnicode_New(int length)
+{
+    register PyUnicodeObject *unicode;
+
+    /* Optimization for empty strings */
+    if (length == 0 && unicode_empty != NULL) {
+        Py_INCREF(unicode_empty);
+        return unicode_empty;
+    }
+
+    /* Unicode freelist & memory allocation */
+    if (unicode_freelist) {
+        unicode = unicode_freelist;
+        unicode_freelist = *(PyUnicodeObject **)unicode_freelist;
+        unicode_freelist_size--;
+        unicode->ob_type = &PyUnicode_Type;
+        _Py_NewReference(unicode);
+	if (unicode->str) {
+	    if (unicode->length < length &&
+		_PyUnicode_Resize(unicode, length)) {
+		free(unicode->str);
+		PyMem_DEL(unicode);
+		return NULL;
+	    }
+	}
+	else
+	    unicode->str = PyMem_NEW(Py_UNICODE, length + 1);
+    }
+    else {
+        unicode = PyObject_NEW(PyUnicodeObject, &PyUnicode_Type);
+        if (unicode == NULL)
+            return NULL;
+	unicode->str = PyMem_NEW(Py_UNICODE, length + 1);
+    }
+
+    if (!unicode->str) {
+        PyMem_DEL(unicode);
+        PyErr_NoMemory();
+        return NULL;
+    }
+    unicode->str[length] = 0;
+    unicode->length = length;
+    unicode->hash = -1;
+    unicode->utf8str = NULL;
+    return unicode;
+}
+
+static
+void _PyUnicode_Free(register PyUnicodeObject *unicode)
+{
+    Py_XDECREF(unicode->utf8str);
+    if (unicode_freelist_size < MAX_UNICODE_FREELIST_SIZE) {
+	if (unicode->length >= STAYALIVE_SIZE_LIMIT) {
+	    free(unicode->str);
+	    unicode->str = NULL;
+	    unicode->length = 0;
+	}
+        *(PyUnicodeObject **)unicode = unicode_freelist;
+        unicode_freelist = unicode;
+        unicode_freelist_size++;
+        _Py_ForgetReference(unicode);
+    }
+    else {
+	free(unicode->str);
+        PyMem_DEL(unicode);
+    }
+}
+
+PyObject *PyUnicode_FromUnicode(const Py_UNICODE *u,
+				int size)
+{
+    PyUnicodeObject *unicode;
+
+    unicode = _PyUnicode_New(size);
+    if (!unicode)
+        return NULL;
+
+    /* Copy the Unicode data into the new object */
+    if (u != NULL)
+	memcpy(unicode->str, u, size * sizeof(Py_UNICODE));
+
+    return (PyObject *)unicode;
+}
+
+#ifdef HAVE_WCHAR_H
+
+PyObject *PyUnicode_FromWideChar(register const wchar_t *w,
+				 int size)
+{
+    PyUnicodeObject *unicode;
+
+    if (w == NULL) {
+	PyErr_BadInternalCall();
+	return NULL;
+    }
+
+    unicode = _PyUnicode_New(size);
+    if (!unicode)
+        return NULL;
+
+    /* Copy the wchar_t data into the new object */
+#ifdef HAVE_USABLE_WCHAR_T
+    memcpy(unicode->str, w, size * sizeof(wchar_t));
+#else    
+    {
+	register Py_UNICODE *u;
+	register int i;
+	u = PyUnicode_AS_UNICODE(unicode);
+	for (i = size; i >= 0; i--)
+	    *u++ = *w++;
+    }
+#endif
+
+    return (PyObject *)unicode;
+}
+
+int PyUnicode_AsWideChar(PyUnicodeObject *unicode,
+			 register wchar_t *w,
+			 int size)
+{
+    if (unicode == NULL) {
+	PyErr_BadInternalCall();
+	return -1;
+    }
+    if (size > PyUnicode_GET_SIZE(unicode))
+	size = PyUnicode_GET_SIZE(unicode);
+#ifdef HAVE_USABLE_WCHAR_T
+    memcpy(w, unicode->str, size * sizeof(wchar_t));
+#else
+    {
+	register Py_UNICODE *u;
+	register int i;
+	u = PyUnicode_AS_UNICODE(unicode);
+	for (i = size; i >= 0; i--)
+	    *w++ = *u++;
+    }
+#endif
+
+    return size;
+}
+
+#endif
+
+PyObject *PyUnicode_FromObject(register PyObject *obj)
+{
+    const char *s;
+    int len;
+    
+    if (obj == NULL) {
+	PyErr_BadInternalCall();
+	return NULL;
+    }
+    else if (PyUnicode_Check(obj)) {
+	Py_INCREF(obj);
+	return obj;
+    }
+    else if (PyString_Check(obj)) {
+	s = PyString_AS_STRING(obj);
+	len = PyString_GET_SIZE(obj);
+    }
+    else if (PyObject_AsCharBuffer(obj, &s, &len))
+	return NULL;
+    if (len == 0) {
+	Py_INCREF(unicode_empty);
+	return (PyObject *)unicode_empty;
+    }
+    return PyUnicode_DecodeUTF8(s, len, "strict");
+}
+
+PyObject *PyUnicode_Decode(const char *s,
+			   int size,
+			   const char *encoding,
+			   const char *errors)
+{
+    PyObject *buffer = NULL, *unicode;
+    
+    /* Shortcut for the default encoding UTF-8 */
+    if (encoding == NULL || 
+        (strcmp(encoding, "utf-8") == 0))
+        return PyUnicode_DecodeUTF8(s, size, errors);
+
+    /* Decode via the codec registry */
+    buffer = PyBuffer_FromMemory((void *)s, size);
+    if (buffer == NULL)
+        goto onError;
+    unicode = PyCodec_Decode(buffer, encoding, errors);
+    if (unicode == NULL)
+        goto onError;
+    if (!PyUnicode_Check(unicode)) {
+        PyErr_Format(PyExc_TypeError,
+                     "decoder did not return an unicode object (type=%s)",
+                     unicode->ob_type->tp_name);
+        Py_DECREF(unicode);
+        goto onError;
+    }
+    Py_DECREF(buffer);
+    return unicode;
+    
+ onError:
+    Py_XDECREF(buffer);
+    return NULL;
+}
+
+PyObject *PyUnicode_Encode(const Py_UNICODE *s,
+			   int size,
+			   const char *encoding,
+			   const char *errors)
+{
+    PyObject *v, *unicode;
+    
+    unicode = PyUnicode_FromUnicode(s, size);
+    if (unicode == NULL)
+	return NULL;
+    v = PyUnicode_AsEncodedString(unicode, encoding, errors);
+    Py_DECREF(unicode);
+    return v;
+}
+
+PyObject *PyUnicode_AsEncodedString(PyObject *unicode,
+                                    const char *encoding,
+                                    const char *errors)
+{
+    PyObject *v;
+    
+    if (!PyUnicode_Check(unicode)) {
+        PyErr_BadArgument();
+        goto onError;
+    }
+    /* Shortcut for the default encoding UTF-8 */
+    if ((encoding == NULL || 
+	 (strcmp(encoding, "utf-8") == 0)) &&
+	errors == NULL)
+        return PyUnicode_AsUTF8String(unicode);
+
+    /* Encode via the codec registry */
+    v = PyCodec_Encode(unicode, encoding, errors);
+    if (v == NULL)
+        goto onError;
+    /* XXX Should we really enforce this ? */
+    if (!PyString_Check(v)) {
+        PyErr_Format(PyExc_TypeError,
+                     "encoder did not return a string object (type=%s)",
+                     v->ob_type->tp_name);
+        Py_DECREF(v);
+        goto onError;
+    }
+    return v;
+    
+ onError:
+    return NULL;
+}
+
+Py_UNICODE *PyUnicode_AsUnicode(PyObject *unicode)
+{
+    if (!PyUnicode_Check(unicode)) {
+        PyErr_BadArgument();
+        goto onError;
+    }
+    return PyUnicode_AS_UNICODE(unicode);
+
+ onError:
+    return NULL;
+}
+
+int PyUnicode_GetSize(PyObject *unicode)
+{
+    if (!PyUnicode_Check(unicode)) {
+        PyErr_BadArgument();
+        goto onError;
+    }
+    return PyUnicode_GET_SIZE(unicode);
+
+ onError:
+    return -1;
+}
+
+/* --- UTF-8 Codec -------------------------------------------------------- */
+
+static 
+char utf8_code_length[256] = {
+    /* Map UTF-8 encoded prefix byte to sequence length.  zero means
+       illegal prefix.  see RFC 2279 for details */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0
+};
+
+static
+int utf8_decoding_error(const char **source,
+                        Py_UNICODE **dest,
+                        const char *errors,
+                        const char *details) 
+{
+    if ((errors == NULL) ||
+        (strcmp(errors,"strict") == 0)) {
+        PyErr_Format(PyExc_UnicodeError,
+                     "UTF-8 decoding error: %s",
+                     details);
+        return -1;
+    }
+    else if (strcmp(errors,"ignore") == 0) {
+        (*source)++;
+        return 0;
+    }
+    else if (strcmp(errors,"replace") == 0) {
+        (*source)++;
+        **dest = Py_UNICODE_REPLACEMENT_CHARACTER;
+        (*dest)++;
+        return 0;
+    }
+    else {
+        PyErr_Format(PyExc_ValueError,
+                     "UTF-8 decoding error; unkown error handling code: %s",
+                     errors);
+        return -1;
+    }
+}
+
+#define UTF8_ERROR(details)  do {                       \
+    if (utf8_decoding_error(&s, &p, errors, details))   \
+        goto onError;                                   \
+    continue;                                           \
+} while (0)
+
+PyObject *PyUnicode_DecodeUTF8(const char *s,
+			       int size,
+			       const char *errors)
+{
+    int n;
+    const char *e;
+    PyUnicodeObject *unicode;
+    Py_UNICODE *p;
+
+    /* Note: size will always be longer than the resulting Unicode
+       character count */
+    unicode = _PyUnicode_New(size);
+    if (!unicode)
+        return NULL;
+    if (size == 0)
+        return (PyObject *)unicode;
+
+    /* Unpack UTF-8 encoded data */
+    p = unicode->str;
+    e = s + size;
+
+    while (s < e) {
+        register Py_UNICODE ch = (unsigned char)*s;
+
+        if (ch < 0x80) {
+            *p++ = ch;
+            s++;
+            continue;
+        }
+
+        n = utf8_code_length[ch];
+
+        if (s + n > e)
+            UTF8_ERROR("unexpected end of data");
+
+        switch (n) {
+
+        case 0:
+            UTF8_ERROR("unexpected code byte");
+            break;
+
+        case 1:
+            UTF8_ERROR("internal error");
+            break;
+
+        case 2:
+            if ((s[1] & 0xc0) != 0x80) 
+                UTF8_ERROR("invalid data");
+            ch = ((s[0] & 0x1f) << 6) + (s[1] & 0x3f);
+            if (ch < 0x80)
+                UTF8_ERROR("illegal encoding");
+	    else
+		*p++ = ch;
+            break;
+
+        case 3:
+            if ((s[1] & 0xc0) != 0x80 || 
+                (s[2] & 0xc0) != 0x80) 
+                UTF8_ERROR("invalid data");
+            ch = ((s[0] & 0x0f) << 12) + ((s[1] & 0x3f) << 6) + (s[2] & 0x3f);
+            if (ch < 0x800 || (ch >= 0xd800 && ch < 0xe000))
+                UTF8_ERROR("illegal encoding");
+	    else
+		*p++ = ch;
+            break;
+
+        default:
+            /* Other sizes are only needed for UCS-4 */
+            UTF8_ERROR("unsupported Unicode code range");
+        }
+        s += n;
+    }
+
+    /* Adjust length */
+    if (_PyUnicode_Resize(unicode, p - unicode->str))
+        goto onError;
+
+    return (PyObject *)unicode;
+
+onError:
+    Py_DECREF(unicode);
+    return NULL;
+}
+
+#undef UTF8_ERROR
+
+static
+int utf8_encoding_error(const Py_UNICODE **source,
+			char **dest,
+			const char *errors,
+			const char *details) 
+{
+    if ((errors == NULL) ||
+	(strcmp(errors,"strict") == 0)) {
+	PyErr_Format(PyExc_UnicodeError,
+		     "UTF-8 encoding error: %s",
+		     details);
+	return -1;
+    }
+    else if (strcmp(errors,"ignore") == 0) {
+	return 0;
+    }
+    else if (strcmp(errors,"replace") == 0) {
+	**dest = '?';
+	(*dest)++;
+	return 0;
+    }
+    else {
+	PyErr_Format(PyExc_ValueError,
+		     "UTF-8 encoding error; "
+		     "unkown error handling code: %s",
+		     errors);
+	return -1;
+    }
+}
+
+PyObject *PyUnicode_EncodeUTF8(const Py_UNICODE *s,
+			       int size,
+			       const char *errors)
+{
+    PyObject *v;
+    char *p;
+    char *q;
+
+    v = PyString_FromStringAndSize(NULL, 3 * size);
+    if (v == NULL)
+        return NULL;
+    if (size == 0)
+        goto done;
+
+    p = q = PyString_AS_STRING(v);
+    while (size-- > 0) {
+        Py_UNICODE ch = *s++;
+        if (ch < 0x80)
+            *p++ = (char) ch;
+        else if (ch < 0x0800) {
+            *p++ = 0xc0 | (ch >> 6);
+            *p++ = 0x80 | (ch & 0x3f);
+	} else if (0xD800 <= ch && ch <= 0xDFFF) {
+	    /* These byte ranges are reserved for UTF-16 surrogate
+	       bytes which the Python implementation currently does
+	       not support. */
+	    printf("code range problem: U+%04x\n", ch);
+	    if (utf8_encoding_error(&s, &p, errors, 
+				    "unsupported code range"))
+		goto onError;
+        } else {
+            *p++ = 0xe0 | (ch >> 12);
+            *p++ = 0x80 | ((ch >> 6) & 0x3f);
+            *p++ = 0x80 | (ch & 0x3f);
+        }
+    }
+    *p = '\0';
+    _PyString_Resize(&v, p - q);
+
+ done:
+    return v;
+
+ onError:
+    Py_DECREF(v);
+    return NULL;
+}
+
+/* Return a Python string holding the UTF-8 encoded value of the
+   Unicode object. 
+
+   The resulting string is cached in the Unicode object for subsequent
+   usage by this function. The cached version is needed to implement
+   the character buffer interface.
+
+   The refcount of the string is *not* incremented.
+
+*/
+
+static
+PyObject *utf8_string(PyUnicodeObject *self,
+		      const char *errors)
+{
+    PyObject *v = self->utf8str;
+
+    if (v)
+        return v;
+    v = PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(self),
+			     PyUnicode_GET_SIZE(self),
+			     errors);
+    if (v && errors == NULL)
+        self->utf8str = v;
+    return v;
+}
+
+PyObject *PyUnicode_AsUTF8String(PyObject *unicode)
+{
+    PyObject *str;
+    
+    if (!PyUnicode_Check(unicode)) {
+        PyErr_BadArgument();
+        return NULL;
+    }
+    str = utf8_string((PyUnicodeObject *)unicode, NULL);
+    if (str == NULL)
+        return NULL;
+    Py_INCREF(str);
+    return str;
+}
+
+/* --- UTF-16 Codec ------------------------------------------------------- */
+
+static
+int utf16_decoding_error(const Py_UNICODE **source,
+			 Py_UNICODE **dest,
+			 const char *errors,
+			 const char *details) 
+{
+    if ((errors == NULL) ||
+        (strcmp(errors,"strict") == 0)) {
+        PyErr_Format(PyExc_UnicodeError,
+                     "UTF-16 decoding error: %s",
+                     details);
+        return -1;
+    }
+    else if (strcmp(errors,"ignore") == 0) {
+        return 0;
+    }
+    else if (strcmp(errors,"replace") == 0) {
+	if (dest) {
+	    **dest = Py_UNICODE_REPLACEMENT_CHARACTER;
+	    (*dest)++;
+	}
+        return 0;
+    }
+    else {
+        PyErr_Format(PyExc_ValueError,
+                     "UTF-16 decoding error; unkown error handling code: %s",
+                     errors);
+        return -1;
+    }
+}
+
+#define UTF16_ERROR(details)  do {                       \
+    if (utf16_decoding_error(&q, &p, errors, details))   \
+        goto onError;                                    \
+    continue;                                            \
+} while(0)
+
+PyObject *PyUnicode_DecodeUTF16(const char *s,
+				int size,
+				const char *errors,
+				int *byteorder)
+{
+    PyUnicodeObject *unicode;
+    Py_UNICODE *p;
+    const Py_UNICODE *q, *e;
+    int bo = 0;
+
+    /* size should be an even number */
+    if (size % sizeof(Py_UNICODE) != 0) {
+	if (utf16_decoding_error(NULL, NULL, errors, "truncated data"))
+	    return NULL;
+	/* The remaining input chars are ignored if we fall through
+           here... */
+    }
+
+    /* Note: size will always be longer than the resulting Unicode
+       character count */
+    unicode = _PyUnicode_New(size);
+    if (!unicode)
+        return NULL;
+    if (size == 0)
+        return (PyObject *)unicode;
+
+    /* Unpack UTF-16 encoded data */
+    p = unicode->str;
+    q = (Py_UNICODE *)s;
+    e = q + (size / sizeof(Py_UNICODE));
+
+    if (byteorder)
+	bo = *byteorder;
+
+    while (q < e) {
+	register Py_UNICODE ch = *q++;
+
+	/* Check for BOM marks (U+FEFF) in the input and adjust
+	   current byte order setting accordingly. Swap input
+	   bytes if needed. (This assumes sizeof(Py_UNICODE) == 2
+	   !) */
+#ifdef BYTEORDER_IS_LITTLE_ENDIAN
+	if (ch == 0xFEFF) {
+	    bo = -1;
+	    continue;
+	} else if (ch == 0xFFFE) {
+	    bo = 1;
+	    continue;
+	}
+	if (bo == 1)
+	    ch = (ch >> 8) | (ch << 8);
+#else    
+	if (ch == 0xFEFF) {
+	    bo = 1;
+	    continue;
+	} else if (ch == 0xFFFE) {
+	    bo = -1;
+	    continue;
+	}
+	if (bo == -1)
+	    ch = (ch >> 8) | (ch << 8);
+#endif
+	if (ch < 0xD800 || ch > 0xDFFF) {
+	    *p++ = ch;
+	    continue;
+	}
+
+	/* UTF-16 code pair: */
+	if (q >= e)
+	    UTF16_ERROR("unexpected end of data");
+	if (0xDC00 <= *q && *q <= 0xDFFF) {
+	    q++;
+	    if (0xD800 <= *q && *q <= 0xDBFF)
+		/* This is valid data (a UTF-16 surrogate pair), but
+		   we are not able to store this information since our
+		   Py_UNICODE type only has 16 bits... this might
+		   change someday, even though it's unlikely. */
+		UTF16_ERROR("code pairs are not supported");
+	    else
+		continue;
+	}
+	UTF16_ERROR("illegal encoding");
+    }
+
+    if (byteorder)
+        *byteorder = bo;
+
+    /* Adjust length */
+    if (_PyUnicode_Resize(unicode, p - unicode->str))
+        goto onError;
+
+    return (PyObject *)unicode;
+
+onError:
+    Py_DECREF(unicode);
+    return NULL;
+}
+
+#undef UTF16_ERROR
+
+PyObject *PyUnicode_EncodeUTF16(const Py_UNICODE *s,
+				int size,
+				const char *errors,
+				int byteorder)
+{
+    PyObject *v;
+    Py_UNICODE *p;
+    char *q;
+
+    /* We don't create UTF-16 pairs... */
+    v = PyString_FromStringAndSize(NULL, 
+			sizeof(Py_UNICODE) * (size + (byteorder == 0)));
+    if (v == NULL)
+        return NULL;
+    if (size == 0)
+        goto done;
+
+    q = PyString_AS_STRING(v);
+    p = (Py_UNICODE *)q;
+    
+    if (byteorder == 0)
+	*p++ = 0xFEFF;
+    if (byteorder == 0 ||
+#ifdef BYTEORDER_IS_LITTLE_ENDIAN	
+	byteorder == -1
+#else
+	byteorder == 1
+#endif
+	)
+	memcpy(p, s, size * sizeof(Py_UNICODE));
+    else
+	while (size-- > 0) {
+	    Py_UNICODE ch = *s++;
+	    *p++ = (ch >> 8) | (ch << 8);
+	}
+ done:
+    return v;
+}
+
+PyObject *PyUnicode_AsUTF16String(PyObject *unicode)
+{
+    if (!PyUnicode_Check(unicode)) {
+        PyErr_BadArgument();
+        return NULL;
+    }
+    return PyUnicode_EncodeUTF16(PyUnicode_AS_UNICODE(unicode),
+				 PyUnicode_GET_SIZE(unicode),
+				 NULL,
+				 0);
+}
+
+/* --- Unicode Escape Codec ----------------------------------------------- */
+
+static
+int unicodeescape_decoding_error(const char **source,
+                                 unsigned int *x,
+                                 const char *errors,
+                                 const char *details) 
+{
+    if ((errors == NULL) ||
+        (strcmp(errors,"strict") == 0)) {
+        PyErr_Format(PyExc_UnicodeError,
+                     "Unicode-Escape decoding error: %s",
+                     details);
+        return -1;
+    }
+    else if (strcmp(errors,"ignore") == 0) {
+        return 0;
+    }
+    else if (strcmp(errors,"replace") == 0) {
+        *x = (unsigned int)Py_UNICODE_REPLACEMENT_CHARACTER;
+        return 0;
+    }
+    else {
+        PyErr_Format(PyExc_ValueError,
+                     "Unicode-Escape decoding error; "
+                     "unkown error handling code: %s",
+                     errors);
+        return -1;
+    }
+}
+
+PyObject *PyUnicode_DecodeUnicodeEscape(const char *s,
+					int size,
+					const char *errors)
+{
+    PyUnicodeObject *v;
+    Py_UNICODE *p = NULL, *buf = NULL;
+    const char *end;
+    
+    /* Escaped strings will always be longer than the resulting
+       Unicode string, so we start with size here and then reduce the
+       length after conversion to the true value. */
+    v = _PyUnicode_New(size);
+    if (v == NULL)
+        goto onError;
+    if (size == 0)
+        return (PyObject *)v;
+    p = buf = PyUnicode_AS_UNICODE(v);
+    end = s + size;
+    while (s < end) {
+        unsigned char c;
+        unsigned int x;
+        int i;
+
+        /* Non-escape characters are interpreted as Unicode ordinals */
+        if (*s != '\\') {
+            *p++ = (unsigned char)*s++;
+            continue;
+        }
+
+        /* \ - Escapes */
+        s++;
+        switch (*s++) {
+
+        /* \x escapes */
+        case '\n': break;
+        case '\\': *p++ = '\\'; break;
+        case '\'': *p++ = '\''; break;
+        case '\"': *p++ = '\"'; break;
+        case 'b': *p++ = '\b'; break;
+        case 'f': *p++ = '\014'; break; /* FF */
+        case 't': *p++ = '\t'; break;
+        case 'n': *p++ = '\n'; break;
+        case 'r': *p++ = '\r'; break;
+        case 'v': *p++ = '\013'; break; /* VT */
+        case 'a': *p++ = '\007'; break; /* BEL, not classic C */
+
+        /* \OOO (octal) escapes */
+        case '0': case '1': case '2': case '3':
+        case '4': case '5': case '6': case '7':
+            c = s[-1] - '0';
+            if ('0' <= *s && *s <= '7') {
+                c = (c<<3) + *s++ - '0';
+                if ('0' <= *s && *s <= '7')
+                    c = (c<<3) + *s++ - '0';
+            }
+            *p++ = c;
+            break;
+
+        /* \xXXXX escape with 0-4 hex digits */
+        case 'x':
+            x = 0;
+            c = (unsigned char)*s;
+            if (isxdigit(c)) {
+                do {
+                    x = (x<<4) & ~0xF;
+                    if ('0' <= c && c <= '9')
+                        x += c - '0';
+                    else if ('a' <= c && c <= 'f')
+                        x += 10 + c - 'a';
+                    else
+                        x += 10 + c - 'A';
+                    c = (unsigned char)*++s;
+                } while (isxdigit(c));
+                *p++ = x;
+            } else {
+                *p++ = '\\';
+                *p++ = (unsigned char)s[-1];
+            }
+            break;
+
+        /* \uXXXX with 4 hex digits */
+        case 'u':
+            for (x = 0, i = 0; i < 4; i++) {
+                c = (unsigned char)s[i];
+                if (!isxdigit(c)) {
+                    if (unicodeescape_decoding_error(&s, &x, errors,
+                                                     "truncated \\uXXXX"))
+                        goto onError;
+                    i++;
+                    break;
+                }
+                x = (x<<4) & ~0xF;
+                if (c >= '0' && c <= '9')
+                    x += c - '0';
+                else if (c >= 'a' && c <= 'f')
+                    x += 10 + c - 'a';
+                else
+                    x += 10 + c - 'A';
+            }
+            s += i;
+            *p++ = x;
+            break;
+
+        default:
+            *p++ = '\\';
+            *p++ = (unsigned char)s[-1];
+            break;
+        }
+    }
+    _PyUnicode_Resize(v, (int)(p - buf));
+    return (PyObject *)v;
+    
+ onError:
+    Py_XDECREF(v);
+    return NULL;
+}
+
+/* Return a Unicode-Escape string version of the Unicode object.
+
+   If quotes is true, the string is enclosed in u"" or u'' quotes as
+   appropriate.
+
+*/
+
+static
+PyObject *unicodeescape_string(const Py_UNICODE *s,
+                               int size,
+                               int quotes)
+{
+    PyObject *repr;
+    char *p;
+    char *q;
+
+    static const char *hexdigit = "0123456789ABCDEF";
+
+    repr = PyString_FromStringAndSize(NULL, 2 + 6*size + 1);
+    if (repr == NULL)
+        return NULL;
+
+    p = q = PyString_AS_STRING(repr);
+
+    if (quotes) {
+        static const Py_UNICODE *findchar(const Py_UNICODE *s,
+					  int size,
+					  Py_UNICODE ch);
+        *p++ = 'u';
+        *p++ = (findchar(s, size, '\'') && 
+                !findchar(s, size, '"')) ? '"' : '\'';
+    }
+    while (size-- > 0) {
+        Py_UNICODE ch = *s++;
+        /* Escape quotes */
+        if (quotes && (ch == q[1] || ch == '\\')) {
+            *p++ = '\\';
+            *p++ = (char) ch;
+        } 
+        /* Map 16-bit characters to '\uxxxx' */
+        else if (ch >= 256) {
+            *p++ = '\\';
+            *p++ = 'u';
+            *p++ = hexdigit[(ch >> 12) & 0xf];
+            *p++ = hexdigit[(ch >> 8) & 0xf];
+            *p++ = hexdigit[(ch >> 4) & 0xf];
+            *p++ = hexdigit[ch & 15];
+        }
+        /* Map non-printable US ASCII to '\ooo' */
+        else if (ch < ' ' || ch >= 128) {
+            *p++ = '\\';
+            *p++ = hexdigit[(ch >> 6) & 7];
+            *p++ = hexdigit[(ch >> 3) & 7];
+            *p++ = hexdigit[ch & 7];
+        } 
+        /* Copy everything else as-is */
+        else
+            *p++ = (char) ch;
+    }
+    if (quotes)
+        *p++ = q[1];
+
+    *p = '\0';
+    _PyString_Resize(&repr, p - q);
+
+    return repr;
+}
+
+PyObject *PyUnicode_EncodeUnicodeEscape(const Py_UNICODE *s,
+					int size)
+{
+    return unicodeescape_string(s, size, 0);
+}
+
+PyObject *PyUnicode_AsUnicodeEscapeString(PyObject *unicode)
+{
+    if (!PyUnicode_Check(unicode)) {
+        PyErr_BadArgument();
+        return NULL;
+    }
+    return PyUnicode_EncodeUnicodeEscape(PyUnicode_AS_UNICODE(unicode),
+					 PyUnicode_GET_SIZE(unicode));
+}
+
+/* --- Raw Unicode Escape Codec ------------------------------------------- */
+
+PyObject *PyUnicode_DecodeRawUnicodeEscape(const char *s,
+					   int size,
+					   const char *errors)
+{
+    PyUnicodeObject *v;
+    Py_UNICODE *p, *buf;
+    const char *end;
+    const char *bs;
+    
+    /* Escaped strings will always be longer than the resulting
+       Unicode string, so we start with size here and then reduce the
+       length after conversion to the true value. */
+    v = _PyUnicode_New(size);
+    if (v == NULL)
+	goto onError;
+    if (size == 0)
+	return (PyObject *)v;
+    p = buf = PyUnicode_AS_UNICODE(v);
+    end = s + size;
+    while (s < end) {
+	unsigned char c;
+	unsigned int x;
+	int i;
+
+	/* Non-escape characters are interpreted as Unicode ordinals */
+	if (*s != '\\') {
+	    *p++ = (unsigned char)*s++;
+	    continue;
+	}
+
+	/* \u-escapes are only interpreted iff the number of leading
+	   backslashes if odd */
+	bs = s;
+	for (;s < end;) {
+	    if (*s != '\\')
+		break;
+	    *p++ = (unsigned char)*s++;
+	}
+	if (((s - bs) & 1) == 0 ||
+	    s >= end ||
+	    *s != 'u') {
+	    continue;
+	}
+	p--;
+	s++;
+
+	/* \uXXXX with 4 hex digits */
+	for (x = 0, i = 0; i < 4; i++) {
+	    c = (unsigned char)s[i];
+	    if (!isxdigit(c)) {
+		if (unicodeescape_decoding_error(&s, &x, errors,
+						 "truncated \\uXXXX"))
+		    goto onError;
+		i++;
+		break;
+	    }
+	    x = (x<<4) & ~0xF;
+	    if (c >= '0' && c <= '9')
+		x += c - '0';
+	    else if (c >= 'a' && c <= 'f')
+		x += 10 + c - 'a';
+	    else
+		x += 10 + c - 'A';
+	}
+	s += i;
+	*p++ = x;
+    }
+    _PyUnicode_Resize(v, (int)(p - buf));
+    return (PyObject *)v;
+    
+ onError:
+    Py_XDECREF(v);
+    return NULL;
+}
+
+PyObject *PyUnicode_EncodeRawUnicodeEscape(const Py_UNICODE *s,
+					   int size)
+{
+    PyObject *repr;
+    char *p;
+    char *q;
+
+    static const char *hexdigit = "0123456789ABCDEF";
+
+    repr = PyString_FromStringAndSize(NULL, 6 * size);
+    if (repr == NULL)
+        return NULL;
+
+    p = q = PyString_AS_STRING(repr);
+    while (size-- > 0) {
+        Py_UNICODE ch = *s++;
+	/* Map 16-bit characters to '\uxxxx' */
+	if (ch >= 256) {
+            *p++ = '\\';
+            *p++ = 'u';
+            *p++ = hexdigit[(ch >> 12) & 0xf];
+            *p++ = hexdigit[(ch >> 8) & 0xf];
+            *p++ = hexdigit[(ch >> 4) & 0xf];
+            *p++ = hexdigit[ch & 15];
+        }
+	/* Copy everything else as-is */
+	else
+            *p++ = (char) ch;
+    }
+    *p = '\0';
+    _PyString_Resize(&repr, p - q);
+
+    return repr;
+}
+
+PyObject *PyUnicode_AsRawUnicodeEscapeString(PyObject *unicode)
+{
+    if (!PyUnicode_Check(unicode)) {
+	PyErr_BadArgument();
+	return NULL;
+    }
+    return PyUnicode_EncodeRawUnicodeEscape(PyUnicode_AS_UNICODE(unicode),
+					    PyUnicode_GET_SIZE(unicode));
+}
+
+/* --- Latin-1 Codec ------------------------------------------------------ */
+
+PyObject *PyUnicode_DecodeLatin1(const char *s,
+				 int size,
+				 const char *errors)
+{
+    PyUnicodeObject *v;
+    Py_UNICODE *p;
+    
+    /* Latin-1 is equivalent to the first 256 ordinals in Unicode. */
+    v = _PyUnicode_New(size);
+    if (v == NULL)
+	goto onError;
+    if (size == 0)
+	return (PyObject *)v;
+    p = PyUnicode_AS_UNICODE(v);
+    while (size-- > 0)
+	*p++ = (unsigned char)*s++;
+    return (PyObject *)v;
+    
+ onError:
+    Py_XDECREF(v);
+    return NULL;
+}
+
+static
+int latin1_encoding_error(const Py_UNICODE **source,
+			  char **dest,
+			  const char *errors,
+			  const char *details) 
+{
+    if ((errors == NULL) ||
+	(strcmp(errors,"strict") == 0)) {
+	PyErr_Format(PyExc_UnicodeError,
+		     "Latin-1 encoding error: %s",
+		     details);
+	return -1;
+    }
+    else if (strcmp(errors,"ignore") == 0) {
+	return 0;
+    }
+    else if (strcmp(errors,"replace") == 0) {
+	**dest = '?';
+	return 0;
+    }
+    else {
+	PyErr_Format(PyExc_ValueError,
+		     "Latin-1 encoding error; "
+		     "unkown error handling code: %s",
+		     errors);
+	return -1;
+    }
+}
+
+PyObject *PyUnicode_EncodeLatin1(const Py_UNICODE *p,
+				 int size,
+				 const char *errors)
+{
+    PyObject *repr;
+    char *s;
+    repr = PyString_FromStringAndSize(NULL, size);
+    if (repr == NULL)
+        return NULL;
+
+    s = PyString_AS_STRING(repr);
+    while (size-- > 0) {
+        Py_UNICODE ch = *p++;
+	if (ch >= 256) {
+	    if (latin1_encoding_error(&p, &s, errors, 
+				      "ordinal not in range(256)"))
+		goto onError;
+	}
+	else
+            *s++ = (char)ch;
+    }
+    return repr;
+
+ onError:
+    Py_DECREF(repr);
+    return NULL;
+}
+
+PyObject *PyUnicode_AsLatin1String(PyObject *unicode)
+{
+    if (!PyUnicode_Check(unicode)) {
+	PyErr_BadArgument();
+	return NULL;
+    }
+    return PyUnicode_EncodeLatin1(PyUnicode_AS_UNICODE(unicode),
+				  PyUnicode_GET_SIZE(unicode),
+				  NULL);
+}
+
+/* --- 7-bit ASCII Codec -------------------------------------------------- */
+
+static
+int ascii_decoding_error(const char **source,
+			 Py_UNICODE **dest,
+			 const char *errors,
+			 const char *details) 
+{
+    if ((errors == NULL) ||
+	(strcmp(errors,"strict") == 0)) {
+	PyErr_Format(PyExc_UnicodeError,
+		     "ASCII decoding error: %s",
+		     details);
+	return -1;
+    }
+    else if (strcmp(errors,"ignore") == 0) {
+	return 0;
+    }
+    else if (strcmp(errors,"replace") == 0) {
+	**dest = Py_UNICODE_REPLACEMENT_CHARACTER;
+	(*dest)++;
+	return 0;
+    }
+    else {
+	PyErr_Format(PyExc_ValueError,
+		     "ASCII decoding error; "
+		     "unkown error handling code: %s",
+		     errors);
+	return -1;
+    }
+}
+
+PyObject *PyUnicode_DecodeASCII(const char *s,
+				int size,
+				const char *errors)
+{
+    PyUnicodeObject *v;
+    Py_UNICODE *p;
+    
+    /* ASCII is equivalent to the first 128 ordinals in Unicode. */
+    v = _PyUnicode_New(size);
+    if (v == NULL)
+	goto onError;
+    if (size == 0)
+	return (PyObject *)v;
+    p = PyUnicode_AS_UNICODE(v);
+    while (size-- > 0) {
+	register unsigned char c;
+
+	c = (unsigned char)*s++;
+	if (c < 128)
+	    *p++ = c;
+	else if (ascii_decoding_error(&s, &p, errors, 
+				      "ordinal not in range(128)"))
+		goto onError;
+    }
+    if (p - PyUnicode_AS_UNICODE(v) < size)
+	_PyUnicode_Resize(v, (int)(p - PyUnicode_AS_UNICODE(v)));	
+    return (PyObject *)v;
+    
+ onError:
+    Py_XDECREF(v);
+    return NULL;
+}
+
+static
+int ascii_encoding_error(const Py_UNICODE **source,
+			 char **dest,
+			 const char *errors,
+			 const char *details) 
+{
+    if ((errors == NULL) ||
+	(strcmp(errors,"strict") == 0)) {
+	PyErr_Format(PyExc_UnicodeError,
+		     "ASCII encoding error: %s",
+		     details);
+	return -1;
+    }
+    else if (strcmp(errors,"ignore") == 0) {
+	return 0;
+    }
+    else if (strcmp(errors,"replace") == 0) {
+	**dest = '?';
+	return 0;
+    }
+    else {
+	PyErr_Format(PyExc_ValueError,
+		     "ASCII encoding error; "
+		     "unkown error handling code: %s",
+		     errors);
+	return -1;
+    }
+}
+
+PyObject *PyUnicode_EncodeASCII(const Py_UNICODE *p,
+				int size,
+				const char *errors)
+{
+    PyObject *repr;
+    char *s;
+    repr = PyString_FromStringAndSize(NULL, size);
+    if (repr == NULL)
+        return NULL;
+
+    s = PyString_AS_STRING(repr);
+    while (size-- > 0) {
+        Py_UNICODE ch = *p++;
+	if (ch >= 128) {
+	    if (ascii_encoding_error(&p, &s, errors, 
+				      "ordinal not in range(128)"))
+		goto onError;
+	}
+	else
+            *s++ = (char)ch;
+    }
+    return repr;
+
+ onError:
+    Py_DECREF(repr);
+    return NULL;
+}
+
+PyObject *PyUnicode_AsASCIIString(PyObject *unicode)
+{
+    if (!PyUnicode_Check(unicode)) {
+	PyErr_BadArgument();
+	return NULL;
+    }
+    return PyUnicode_EncodeASCII(PyUnicode_AS_UNICODE(unicode),
+				 PyUnicode_GET_SIZE(unicode),
+				 NULL);
+}
+
+/* --- Character Mapping Codec -------------------------------------------- */
+
+static
+int charmap_decoding_error(const char **source,
+			 Py_UNICODE **dest,
+			 const char *errors,
+			 const char *details) 
+{
+    if ((errors == NULL) ||
+	(strcmp(errors,"strict") == 0)) {
+	PyErr_Format(PyExc_UnicodeError,
+		     "charmap decoding error: %s",
+		     details);
+	return -1;
+    }
+    else if (strcmp(errors,"ignore") == 0) {
+	return 0;
+    }
+    else if (strcmp(errors,"replace") == 0) {
+	**dest = Py_UNICODE_REPLACEMENT_CHARACTER;
+	(*dest)++;
+	return 0;
+    }
+    else {
+	PyErr_Format(PyExc_ValueError,
+		     "charmap decoding error; "
+		     "unkown error handling code: %s",
+		     errors);
+	return -1;
+    }
+}
+
+PyObject *PyUnicode_DecodeCharmap(const char *s,
+				  int size,
+				  PyObject *mapping,
+				  const char *errors)
+{
+    PyUnicodeObject *v;
+    Py_UNICODE *p;
+    
+    /* Default to Latin-1 */
+    if (mapping == NULL)
+	return PyUnicode_DecodeLatin1(s, size, errors);
+
+    v = _PyUnicode_New(size);
+    if (v == NULL)
+	goto onError;
+    if (size == 0)
+	return (PyObject *)v;
+    p = PyUnicode_AS_UNICODE(v);
+    while (size-- > 0) {
+	unsigned char ch = *s++;
+	PyObject *w, *x;
+
+	/* Get mapping (char ordinal -> integer, Unicode char or None) */
+	w = PyInt_FromLong((long)ch);
+	if (w == NULL)
+	    goto onError;
+	x = PyObject_GetItem(mapping, w);
+	Py_DECREF(w);
+	if (x == NULL) {
+	    if (PyErr_ExceptionMatches(PyExc_LookupError)) {
+		/* No mapping found: default to Latin-1 mapping */
+		PyErr_Clear();
+		*p++ = (Py_UNICODE)ch;
+		continue;
+	    }
+	    goto onError;
+	}
+
+	/* Apply mapping */
+	if (PyInt_Check(x)) {
+	    int value = PyInt_AS_LONG(x);
+	    if (value < 0 || value > 65535) {
+		PyErr_SetString(PyExc_TypeError,
+				"character mapping must be in range(65336)");
+		Py_DECREF(x);
+		goto onError;
+	    }
+	    *p++ = (Py_UNICODE)value;
+	}
+	else if (x == Py_None) {
+	    /* undefined mapping */
+	    if (charmap_decoding_error(&s, &p, errors, 
+				       "character maps to <undefined>")) {
+		Py_DECREF(x);
+		goto onError;
+	    }
+	}
+	else if (PyUnicode_Check(x)) {
+	    if (PyUnicode_GET_SIZE(x) != 1) {
+		/* 1-n mapping */
+		PyErr_SetString(PyExc_NotImplementedError,
+				"1-n mappings are currently not implemented");
+		Py_DECREF(x);
+		goto onError;
+	    }
+	    *p++ = *PyUnicode_AS_UNICODE(x);
+	}
+	else {
+	    /* wrong return value */
+	    PyErr_SetString(PyExc_TypeError,
+		  "character mapping must return integer, None or unicode");
+	    Py_DECREF(x);
+	    goto onError;
+	}
+	Py_DECREF(x);
+    }
+    if (p - PyUnicode_AS_UNICODE(v) < PyUnicode_GET_SIZE(v))
+	if (_PyUnicode_Resize(v, (int)(p - PyUnicode_AS_UNICODE(v))))
+	    goto onError;
+    return (PyObject *)v;
+    
+ onError:
+    Py_XDECREF(v);
+    return NULL;
+}
+
+static
+int charmap_encoding_error(const Py_UNICODE **source,
+			   char **dest,
+			   const char *errors,
+			   const char *details) 
+{
+    if ((errors == NULL) ||
+	(strcmp(errors,"strict") == 0)) {
+	PyErr_Format(PyExc_UnicodeError,
+		     "charmap encoding error: %s",
+		     details);
+	return -1;
+    }
+    else if (strcmp(errors,"ignore") == 0) {
+	return 0;
+    }
+    else if (strcmp(errors,"replace") == 0) {
+	**dest = '?';
+	(*dest)++;
+	return 0;
+    }
+    else {
+	PyErr_Format(PyExc_ValueError,
+		     "charmap encoding error; "
+		     "unkown error handling code: %s",
+		     errors);
+	return -1;
+    }
+}
+
+PyObject *PyUnicode_EncodeCharmap(const Py_UNICODE *p,
+				  int size,
+				  PyObject *mapping,
+				  const char *errors)
+{
+    PyObject *v;
+    char *s;
+
+    /* Default to Latin-1 */
+    if (mapping == NULL)
+	return PyUnicode_EncodeLatin1(p, size, errors);
+
+    v = PyString_FromStringAndSize(NULL, size);
+    if (v == NULL)
+        return NULL;
+    s = PyString_AS_STRING(v);
+    while (size-- > 0) {
+	Py_UNICODE ch = *p++;
+	PyObject *w, *x;
+
+	/* Get mapping (Unicode ordinal -> string char, integer or None) */
+	w = PyInt_FromLong((long)ch);
+	if (w == NULL)
+	    goto onError;
+	x = PyObject_GetItem(mapping, w);
+	Py_DECREF(w);
+	if (x == NULL) {
+	    if (PyErr_ExceptionMatches(PyExc_LookupError)) {
+		/* No mapping found: default to Latin-1 mapping if possible */
+		PyErr_Clear();
+		if (ch < 256) {
+		    *s++ = (char)ch;
+		    continue;
+		}
+		else if (!charmap_encoding_error(&p, &s, errors,
+				     "missing character mapping"))
+		    continue;
+	    }
+	    goto onError;
+	}
+
+	/* Apply mapping */
+	if (PyInt_Check(x)) {
+	    int value = PyInt_AS_LONG(x);
+	    if (value < 0 || value > 255) {
+		PyErr_SetString(PyExc_TypeError,
+				"character mapping must be in range(256)");
+		Py_DECREF(x);
+		goto onError;
+	    }
+	    *s++ = (char)value;
+	}
+	else if (x == Py_None) {
+	    /* undefined mapping */
+	    if (charmap_encoding_error(&p, &s, errors, 
+				       "character maps to <undefined>")) {
+		Py_DECREF(x);
+		goto onError;
+	    }
+	}
+	else if (PyString_Check(x)) {
+	    if (PyString_GET_SIZE(x) != 1) {
+		/* 1-n mapping */
+		PyErr_SetString(PyExc_NotImplementedError,
+		      "1-n mappings are currently not implemented");
+		Py_DECREF(x);
+		goto onError;
+	    }
+	    *s++ = *PyString_AS_STRING(x);
+	}
+	else {
+	    /* wrong return value */
+	    PyErr_SetString(PyExc_TypeError,
+		  "character mapping must return integer, None or unicode");
+	    Py_DECREF(x);
+	    goto onError;
+	}
+	Py_DECREF(x);
+    }
+    if (s - PyString_AS_STRING(v) < PyString_GET_SIZE(v))
+	if (_PyString_Resize(&v, (int)(s - PyString_AS_STRING(v))))
+	    goto onError;
+    return v;
+
+ onError:
+    Py_DECREF(v);
+    return NULL;
+}
+
+PyObject *PyUnicode_AsCharmapString(PyObject *unicode,
+				    PyObject *mapping)
+{
+    if (!PyUnicode_Check(unicode) || mapping == NULL) {
+	PyErr_BadArgument();
+	return NULL;
+    }
+    return PyUnicode_EncodeCharmap(PyUnicode_AS_UNICODE(unicode),
+				   PyUnicode_GET_SIZE(unicode),
+				   mapping,
+				   NULL);
+}
+
+static
+int translate_error(const Py_UNICODE **source,
+		    Py_UNICODE **dest,
+		    const char *errors,
+		    const char *details) 
+{
+    if ((errors == NULL) ||
+	(strcmp(errors,"strict") == 0)) {
+	PyErr_Format(PyExc_UnicodeError,
+		     "translate error: %s",
+		     details);
+	return -1;
+    }
+    else if (strcmp(errors,"ignore") == 0) {
+	return 0;
+    }
+    else if (strcmp(errors,"replace") == 0) {
+	**dest = '?';
+	(*dest)++;
+	return 0;
+    }
+    else {
+	PyErr_Format(PyExc_ValueError,
+		     "translate error; "
+		     "unkown error handling code: %s",
+		     errors);
+	return -1;
+    }
+}
+
+PyObject *PyUnicode_TranslateCharmap(const Py_UNICODE *s,
+				     int size,
+				     PyObject *mapping,
+				     const char *errors)
+{
+    PyUnicodeObject *v;
+    Py_UNICODE *p;
+    
+    if (mapping == NULL) {
+	PyErr_BadArgument();
+	return NULL;
+    }
+    
+    /* Output will never be longer than input */
+    v = _PyUnicode_New(size);
+    if (v == NULL)
+	goto onError;
+    if (size == 0)
+	goto done;
+    p = PyUnicode_AS_UNICODE(v);
+    while (size-- > 0) {
+	Py_UNICODE ch = *s++;
+	PyObject *w, *x;
+
+	/* Get mapping */
+	w = PyInt_FromLong(ch);
+	if (w == NULL)
+	    goto onError;
+	x = PyObject_GetItem(mapping, w);
+	Py_DECREF(w);
+	if (x == NULL) {
+	    if (PyErr_ExceptionMatches(PyExc_LookupError)) {
+		/* No mapping found: default to 1-1 mapping */
+		PyErr_Clear();
+		*p++ = ch;
+		continue;
+	    }
+	    goto onError;
+	}
+
+	/* Apply mapping */
+	if (PyInt_Check(x))
+	    *p++ = (Py_UNICODE)PyInt_AS_LONG(x);
+	else if (x == Py_None) {
+	    /* undefined mapping */
+	    if (translate_error(&s, &p, errors, 
+				"character maps to <undefined>")) {
+		Py_DECREF(x);
+		goto onError;
+	    }
+	}
+	else if (PyUnicode_Check(x)) {
+	    if (PyUnicode_GET_SIZE(x) != 1) {
+		/* 1-n mapping */
+		PyErr_SetString(PyExc_NotImplementedError,
+				"1-n mappings are currently not implemented");
+		Py_DECREF(x);
+		goto onError;
+	    }
+	    *p++ = *PyUnicode_AS_UNICODE(x);
+	}
+	else {
+	    /* wrong return value */
+	    PyErr_SetString(PyExc_TypeError,
+		  "translate mapping must return integer, None or unicode");
+	    Py_DECREF(x);
+	    goto onError;
+	}
+	Py_DECREF(x);
+    }
+    if (p - PyUnicode_AS_UNICODE(v) < PyUnicode_GET_SIZE(v))
+	_PyUnicode_Resize(v, (int)(p - PyUnicode_AS_UNICODE(v)));	
+
+ done:
+    return (PyObject *)v;
+    
+ onError:
+    Py_XDECREF(v);
+    return NULL;
+}
+
+PyObject *PyUnicode_Translate(PyObject *str,
+			      PyObject *mapping,
+			      const char *errors)
+{
+    PyObject *result;
+    
+    str = PyUnicode_FromObject(str);
+    if (str == NULL)
+	goto onError;
+    result = PyUnicode_TranslateCharmap(PyUnicode_AS_UNICODE(str),
+					PyUnicode_GET_SIZE(str),
+					mapping,
+					errors);
+    Py_DECREF(str);
+    return result;
+    
+ onError:
+    Py_XDECREF(str);
+    return NULL;
+}
+    
+/* --- Helpers ------------------------------------------------------------ */
+
+static 
+int count(PyUnicodeObject *self,
+	  int start,
+	  int end,
+	  PyUnicodeObject *substring)
+{
+    int count = 0;
+
+    end -= substring->length;
+
+    while (start <= end)
+        if (Py_UNICODE_MATCH(self, start, substring)) {
+            count++;
+            start += substring->length;
+        } else
+            start++;
+
+    return count;
+}
+
+int PyUnicode_Count(PyObject *str,
+		    PyObject *substr,
+		    int start,
+		    int end)
+{
+    int result;
+    
+    str = PyUnicode_FromObject(str);
+    if (str == NULL)
+	return -1;
+    substr = PyUnicode_FromObject(substr);
+    if (substr == NULL) {
+	Py_DECREF(substr);
+	return -1;
+    }
+    
+    result = count((PyUnicodeObject *)str,
+		   start, end,
+		   (PyUnicodeObject *)substr);
+    
+    Py_DECREF(str);
+    Py_DECREF(substr);
+    return result;
+}
+
+static 
+int findstring(PyUnicodeObject *self,
+	       PyUnicodeObject *substring,
+	       int start,
+	       int end,
+	       int direction)
+{
+    if (start < 0)
+        start += self->length;
+    if (start < 0)
+        start = 0;
+
+    if (substring->length == 0)
+        return start;
+
+    if (end > self->length)
+        end = self->length;
+    if (end < 0)
+        end += self->length;
+    if (end < 0)
+        end = 0;
+
+    end -= substring->length;
+
+    if (direction < 0) {
+        for (; end >= start; end--)
+            if (Py_UNICODE_MATCH(self, end, substring))
+                return end;
+    } else {
+        for (; start <= end; start++)
+            if (Py_UNICODE_MATCH(self, start, substring))
+                return start;
+    }
+
+    return -1;
+}
+
+int PyUnicode_Find(PyObject *str,
+		   PyObject *substr,
+		   int start,
+		   int end,
+		   int direction)
+{
+    int result;
+    
+    str = PyUnicode_FromObject(str);
+    if (str == NULL)
+	return -1;
+    substr = PyUnicode_FromObject(substr);
+    if (substr == NULL) {
+	Py_DECREF(substr);
+	return -1;
+    }
+    
+    result = findstring((PyUnicodeObject *)str,
+			(PyUnicodeObject *)substr,
+			start, end, direction);
+    Py_DECREF(str);
+    Py_DECREF(substr);
+    return result;
+}
+
+static 
+int tailmatch(PyUnicodeObject *self,
+	      PyUnicodeObject *substring,
+	      int start,
+	      int end,
+	      int direction)
+{
+    if (start < 0)
+        start += self->length;
+    if (start < 0)
+        start = 0;
+
+    if (substring->length == 0)
+        return 1;
+
+    if (end > self->length)
+        end = self->length;
+    if (end < 0)
+        end += self->length;
+    if (end < 0)
+        end = 0;
+
+    end -= substring->length;
+    if (end < start)
+	return 0;
+
+    if (direction > 0) {
+	if (Py_UNICODE_MATCH(self, end, substring))
+	    return 1;
+    } else {
+        if (Py_UNICODE_MATCH(self, start, substring))
+	    return 1;
+    }
+
+    return 0;
+}
+
+int PyUnicode_Tailmatch(PyObject *str,
+			PyObject *substr,
+			int start,
+			int end,
+			int direction)
+{
+    int result;
+    
+    str = PyUnicode_FromObject(str);
+    if (str == NULL)
+	return -1;
+    substr = PyUnicode_FromObject(substr);
+    if (substr == NULL) {
+	Py_DECREF(substr);
+	return -1;
+    }
+    
+    result = tailmatch((PyUnicodeObject *)str,
+		       (PyUnicodeObject *)substr,
+		       start, end, direction);
+    Py_DECREF(str);
+    Py_DECREF(substr);
+    return result;
+}
+
+static 
+const Py_UNICODE *findchar(const Py_UNICODE *s,
+		     int size,
+		     Py_UNICODE ch)
+{
+    /* like wcschr, but doesn't stop at NULL characters */
+
+    while (size-- > 0) {
+        if (*s == ch)
+            return s;
+        s++;
+    }
+
+    return NULL;
+}
+
+/* Apply fixfct filter to the Unicode object self and return a
+   reference to the modified object */
+
+static 
+PyObject *fixup(PyUnicodeObject *self,
+		int (*fixfct)(PyUnicodeObject *s))
+{
+
+    PyUnicodeObject *u;
+
+    u = (PyUnicodeObject*) PyUnicode_FromUnicode(self->str,
+						 self->length);
+    if (u == NULL)
+	return NULL;
+    if (!fixfct(u)) {
+	/* fixfct should return TRUE if it modified the buffer. If
+	   FALSE, return a reference to the original buffer instead
+	   (to save space, not time) */
+	Py_INCREF(self);
+	Py_DECREF(u);
+	return (PyObject*) self;
+    }
+    return (PyObject*) u;
+}
+
+static 
+int fixupper(PyUnicodeObject *self)
+{
+    int len = self->length;
+    Py_UNICODE *s = self->str;
+    int status = 0;
+    
+    while (len-- > 0) {
+	register Py_UNICODE ch;
+	
+	ch = Py_UNICODE_TOUPPER(*s);
+	if (ch != *s) {
+            status = 1;
+	    *s = ch;
+	}
+        s++;
+    }
+
+    return status;
+}
+
+static 
+int fixlower(PyUnicodeObject *self)
+{
+    int len = self->length;
+    Py_UNICODE *s = self->str;
+    int status = 0;
+    
+    while (len-- > 0) {
+	register Py_UNICODE ch;
+	
+	ch = Py_UNICODE_TOLOWER(*s);
+	if (ch != *s) {
+            status = 1;
+	    *s = ch;
+	}
+        s++;
+    }
+
+    return status;
+}
+
+static 
+int fixswapcase(PyUnicodeObject *self)
+{
+    int len = self->length;
+    Py_UNICODE *s = self->str;
+    int status = 0;
+    
+    while (len-- > 0) {
+        if (Py_UNICODE_ISUPPER(*s)) {
+            *s = Py_UNICODE_TOLOWER(*s);
+            status = 1;
+        } else if (Py_UNICODE_ISLOWER(*s)) {
+            *s = Py_UNICODE_TOUPPER(*s);
+            status = 1;
+        }
+        s++;
+    }
+
+    return status;
+}
+
+static 
+int fixcapitalize(PyUnicodeObject *self)
+{
+    if (self->length > 0 && Py_UNICODE_ISLOWER(self->str[0])) {
+	self->str[0] = Py_UNICODE_TOUPPER(self->str[0]);
+	return 1;
+    }
+    return 0;
+}
+
+static
+int fixtitle(PyUnicodeObject *self)
+{
+    register Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
+    register Py_UNICODE *e;
+    int previous_is_cased;
+
+    /* Shortcut for single character strings */
+    if (PyUnicode_GET_SIZE(self) == 1) {
+	Py_UNICODE ch = Py_UNICODE_TOTITLE(*p);
+	if (*p != ch) {
+	    *p = ch;
+	    return 1;
+	}
+	else
+	    return 0;
+    }
+    
+    e = p + PyUnicode_GET_SIZE(self);
+    previous_is_cased = 0;
+    for (; p < e; p++) {
+	register const Py_UNICODE ch = *p;
+	
+	if (previous_is_cased)
+	    *p = Py_UNICODE_TOLOWER(ch);
+	else
+	    *p = Py_UNICODE_TOTITLE(ch);
+	
+	if (Py_UNICODE_ISLOWER(ch) || 
+	    Py_UNICODE_ISUPPER(ch) || 
+	    Py_UNICODE_ISTITLE(ch))
+	    previous_is_cased = 1;
+	else
+	    previous_is_cased = 0;
+    }
+    return 1;
+}
+
+PyObject *PyUnicode_Join(PyObject *separator,
+			 PyObject *seq)
+{
+    Py_UNICODE *sep;
+    int seplen;
+    PyUnicodeObject *res = NULL;
+    int reslen = 0;
+    Py_UNICODE *p;
+    int seqlen = 0;
+    int sz = 100;
+    int i;
+
+    seqlen = PySequence_Length(seq);
+    if (seqlen < 0 && PyErr_Occurred())
+	return NULL;
+
+    if (separator == NULL) {
+	Py_UNICODE blank = ' ';
+	sep = &blank;
+	seplen = 1;
+    }
+    else {
+	separator = PyUnicode_FromObject(separator);
+	if (separator == NULL)
+	    return NULL;
+	sep = PyUnicode_AS_UNICODE(separator);
+	seplen = PyUnicode_GET_SIZE(separator);
+    }
+    
+    res = _PyUnicode_New(sz);
+    if (res == NULL)
+	goto onError;
+    p = PyUnicode_AS_UNICODE(res);
+    reslen = 0;
+
+    for (i = 0; i < seqlen; i++) {
+	int itemlen;
+	PyObject *item;
+
+	item = PySequence_GetItem(seq, i);
+	if (item == NULL)
+	    goto onError;
+	if (!PyUnicode_Check(item)) {
+	    PyObject *v;
+	    v = PyUnicode_FromObject(item);
+	    Py_DECREF(item);
+	    item = v;
+	    if (item == NULL)
+		goto onError;
+	}
+	itemlen = PyUnicode_GET_SIZE(item);
+	while (reslen + itemlen + seplen >= sz) {
+	    if (_PyUnicode_Resize(res, sz*2))
+		goto onError;
+	    sz *= 2;
+	    p = PyUnicode_AS_UNICODE(res) + reslen;
+	}
+	if (i > 0) {
+	    memcpy(p, sep, seplen * sizeof(Py_UNICODE));
+	    p += seplen;
+	    reslen += seplen;
+	}
+	memcpy(p, PyUnicode_AS_UNICODE(item), itemlen * sizeof(Py_UNICODE));
+	p += itemlen;
+	reslen += itemlen;
+	Py_DECREF(item);
+    }
+    if (_PyUnicode_Resize(res, reslen))
+	goto onError;
+
+    Py_XDECREF(separator);
+    return (PyObject *)res;
+
+ onError:
+    Py_XDECREF(separator);
+    Py_DECREF(res);
+    return NULL;
+}
+
+static 
+PyUnicodeObject *pad(PyUnicodeObject *self, 
+		     int left, 
+		     int right,
+		     Py_UNICODE fill)
+{
+    PyUnicodeObject *u;
+
+    if (left < 0)
+        left = 0;
+    if (right < 0)
+        right = 0;
+
+    if (left == 0 && right == 0) {
+        Py_INCREF(self);
+        return self;
+    }
+
+    u = _PyUnicode_New(left + self->length + right);
+    if (u) {
+        if (left)
+            Py_UNICODE_FILL(u->str, fill, left);
+        Py_UNICODE_COPY(u->str + left, self->str, self->length);
+        if (right)
+            Py_UNICODE_FILL(u->str + left + self->length, fill, right);
+    }
+
+    return u;
+}
+
+#define SPLIT_APPEND(data, left, right)					\
+	str = PyUnicode_FromUnicode(data + left, right - left);		\
+	if (!str)							\
+	    goto onError;						\
+	if (PyList_Append(list, str)) {					\
+	    Py_DECREF(str);						\
+	    goto onError;						\
+	}								\
+        else								\
+            Py_DECREF(str);
+
+static
+PyObject *split_whitespace(PyUnicodeObject *self,
+			   PyObject *list,
+			   int maxcount)
+{
+    register int i;
+    register int j;
+    int len = self->length;
+    PyObject *str;
+
+    for (i = j = 0; i < len; ) {
+	/* find a token */
+	while (i < len && Py_UNICODE_ISSPACE(self->str[i]))
+	    i++;
+	j = i;
+	while (i < len && !Py_UNICODE_ISSPACE(self->str[i]))
+	    i++;
+	if (j < i) {
+	    if (maxcount-- <= 0)
+		break;
+	    SPLIT_APPEND(self->str, j, i);
+	    while (i < len && Py_UNICODE_ISSPACE(self->str[i]))
+		i++;
+	    j = i;
+	}
+    }
+    if (j < len) {
+	SPLIT_APPEND(self->str, j, len);
+    }
+    return list;
+
+ onError:
+    Py_DECREF(list);
+    return NULL;
+}
+
+PyObject *PyUnicode_Splitlines(PyObject *string,
+			       int maxcount)
+{
+    register int i;
+    register int j;
+    int len;
+    PyObject *list;
+    PyObject *str;
+    Py_UNICODE *data;
+
+    string = PyUnicode_FromObject(string);
+    if (string == NULL)
+	return NULL;
+    data = PyUnicode_AS_UNICODE(string);
+    len = PyUnicode_GET_SIZE(string);
+
+    if (maxcount < 0)
+        maxcount = INT_MAX;
+
+    list = PyList_New(0);
+    if (!list)
+        goto onError;
+
+    for (i = j = 0; i < len; ) {
+	/* Find a line and append it */
+	while (i < len && !Py_UNICODE_ISLINEBREAK(data[i]))
+	    i++;
+	if (maxcount-- <= 0)
+	    break;
+	SPLIT_APPEND(data, j, i);
+
+	/* Skip the line break reading CRLF as one line break */
+	if (i < len) {
+	    if (data[i] == '\r' && i + 1 < len &&
+		data[i+1] == '\n')
+		i += 2;
+	    else
+		i++;
+	}
+	j = i;
+    }
+    if (j < len) {
+	SPLIT_APPEND(data, j, len);
+    }
+
+    Py_DECREF(string);
+    return list;
+
+ onError:
+    Py_DECREF(list);
+    Py_DECREF(string);
+    return NULL;
+}
+
+static 
+PyObject *split_char(PyUnicodeObject *self,
+		     PyObject *list,
+		     Py_UNICODE ch,
+		     int maxcount)
+{
+    register int i;
+    register int j;
+    int len = self->length;
+    PyObject *str;
+
+    for (i = j = 0; i < len; ) {
+	if (self->str[i] == ch) {
+	    if (maxcount-- <= 0)
+		break;
+	    SPLIT_APPEND(self->str, j, i);
+	    i = j = i + 1;
+	} else
+	    i++;
+    }
+    if (j <= len) {
+	SPLIT_APPEND(self->str, j, len);
+    }
+    return list;
+
+ onError:
+    Py_DECREF(list);
+    return NULL;
+}
+
+static 
+PyObject *split_substring(PyUnicodeObject *self,
+			  PyObject *list,
+			  PyUnicodeObject *substring,
+			  int maxcount)
+{
+    register int i;
+    register int j;
+    int len = self->length;
+    int sublen = substring->length;
+    PyObject *str;
+
+    for (i = j = 0; i < len - sublen; ) {
+	if (Py_UNICODE_MATCH(self, i, substring)) {
+	    if (maxcount-- <= 0)
+		break;
+	    SPLIT_APPEND(self->str, j, i);
+	    i = j = i + sublen;
+	} else
+	    i++;
+    }
+    if (j <= len) {
+	SPLIT_APPEND(self->str, j, len);
+    }
+    return list;
+
+ onError:
+    Py_DECREF(list);
+    return NULL;
+}
+
+#undef SPLIT_APPEND
+
+static
+PyObject *split(PyUnicodeObject *self,
+		PyUnicodeObject *substring,
+		int maxcount)
+{
+    PyObject *list;
+
+    if (maxcount < 0)
+        maxcount = INT_MAX;
+
+    list = PyList_New(0);
+    if (!list)
+        return NULL;
+
+    if (substring == NULL)
+	return split_whitespace(self,list,maxcount);
+
+    else if (substring->length == 1)
+	return split_char(self,list,substring->str[0],maxcount);
+
+    else if (substring->length == 0) {
+	Py_DECREF(list);
+	PyErr_SetString(PyExc_ValueError, "empty separator");
+	return NULL;
+    }
+    else
+	return split_substring(self,list,substring,maxcount);
+}
+
+static 
+PyObject *strip(PyUnicodeObject *self,
+		int left,
+		int right)
+{
+    Py_UNICODE *p = self->str;
+    int start = 0;
+    int end = self->length;
+
+    if (left)
+        while (start < end && Py_UNICODE_ISSPACE(p[start]))
+            start++;
+
+    if (right)
+        while (end > start && Py_UNICODE_ISSPACE(p[end-1]))
+            end--;
+
+    if (start == 0 && end == self->length) {
+        /* couldn't strip anything off, return original string */
+        Py_INCREF(self);
+        return (PyObject*) self;
+    }
+
+    return (PyObject*) PyUnicode_FromUnicode(
+        self->str + start,
+        end - start
+        );
+}
+
+static 
+PyObject *replace(PyUnicodeObject *self,
+		  PyUnicodeObject *str1,
+		  PyUnicodeObject *str2,
+		  int maxcount)
+{
+    PyUnicodeObject *u;
+
+    if (maxcount < 0)
+	maxcount = INT_MAX;
+
+    if (str1->length == 1 && str2->length == 1) {
+        int i;
+
+        /* replace characters */
+        if (!findchar(self->str, self->length, str1->str[0])) {
+            /* nothing to replace, return original string */
+            Py_INCREF(self);
+            u = self;
+        } else {
+	    Py_UNICODE u1 = str1->str[0];
+	    Py_UNICODE u2 = str2->str[0];
+	    
+            u = (PyUnicodeObject*) PyUnicode_FromUnicode(
+                self->str,
+                self->length
+                );
+            if (u)
+                for (i = 0; i < u->length; i++)
+                    if (u->str[i] == u1) {
+                        if (--maxcount < 0)
+                            break;
+                        u->str[i] = u2;
+                    }
+        }
+
+    } else {
+        int n, i;
+        Py_UNICODE *p;
+
+        /* replace strings */
+        n = count(self, 0, self->length, str1);
+        if (n > maxcount)
+            n = maxcount;
+        if (n == 0) {
+            /* nothing to replace, return original string */
+            Py_INCREF(self);
+            u = self;
+        } else {
+            u = _PyUnicode_New(
+                self->length + n * (str2->length - str1->length));
+            if (u) {
+                i = 0;
+                p = u->str;
+                while (i <= self->length - str1->length)
+                    if (Py_UNICODE_MATCH(self, i, str1)) {
+                        /* replace string segment */
+                        Py_UNICODE_COPY(p, str2->str, str2->length);
+                        p += str2->length;
+                        i += str1->length;
+                        if (--n <= 0) {
+                            /* copy remaining part */
+                            Py_UNICODE_COPY(p, self->str+i, self->length-i);
+                            break;
+                        }
+                    } else
+                        *p++ = self->str[i++];
+            }
+        }
+    }
+    
+    return (PyObject *) u;
+}
+
+/* --- Unicode Object Methods --------------------------------------------- */
+
+static char title__doc__[] =
+"S.title() -> unicode\n\
+\n\
+Return a titlecased version of S, i.e. words start with title case\n\
+characters, all remaining cased characters have lower case.";
+
+static PyObject*
+unicode_title(PyUnicodeObject *self, PyObject *args)
+{
+    if (!PyArg_NoArgs(args))
+        return NULL;
+    return fixup(self, fixtitle);
+}
+
+static char capitalize__doc__[] =
+"S.capitalize() -> unicode\n\
+\n\
+Return a capitalized version of S, i.e. make the first character\n\
+have upper case.";
+
+static PyObject*
+unicode_capitalize(PyUnicodeObject *self, PyObject *args)
+{
+    if (!PyArg_NoArgs(args))
+        return NULL;
+    return fixup(self, fixcapitalize);
+}
+
+#if 0
+static char capwords__doc__[] =
+"S.capwords() -> unicode\n\
+\n\
+Apply .capitalize() to all words in S and return the result with\n\
+normalized whitespace (all whitespace strings are replaced by ' ').";
+
+static PyObject*
+unicode_capwords(PyUnicodeObject *self, PyObject *args)
+{
+    PyObject *list;
+    PyObject *item;
+    int i;
+
+    if (!PyArg_NoArgs(args))
+        return NULL;
+
+    /* Split into words */
+    list = split(self, NULL, -1);
+    if (!list)
+        return NULL;
+
+    /* Capitalize each word */
+    for (i = 0; i < PyList_GET_SIZE(list); i++) {
+        item = fixup((PyUnicodeObject *)PyList_GET_ITEM(list, i),
+		     fixcapitalize);
+        if (item == NULL)
+            goto onError;
+        Py_DECREF(PyList_GET_ITEM(list, i));
+        PyList_SET_ITEM(list, i, item);
+    }
+
+    /* Join the words to form a new string */
+    item = PyUnicode_Join(NULL, list);
+
+onError:
+    Py_DECREF(list);
+    return (PyObject *)item;
+}
+#endif
+
+static char center__doc__[] =
+"S.center(width) -> unicode\n\
+\n\
+Return S centered in a Unicode string of length width. Padding is done\n\
+using spaces.";
+
+static PyObject *
+unicode_center(PyUnicodeObject *self, PyObject *args)
+{
+    int marg, left;
+    int width;
+
+    if (!PyArg_ParseTuple(args, "i:center", &width))
+        return NULL;
+
+    if (self->length >= width) {
+        Py_INCREF(self);
+        return (PyObject*) self;
+    }
+
+    marg = width - self->length;
+    left = marg / 2 + (marg & width & 1);
+
+    return (PyObject*) pad(self, left, marg - left, ' ');
+}
+
+static int
+unicode_compare(PyUnicodeObject *str1, PyUnicodeObject *str2)
+{
+    int len1, len2;
+    Py_UNICODE *s1 = str1->str;
+    Py_UNICODE *s2 = str2->str;
+
+    len1 = str1->length;
+    len2 = str2->length;
+
+    while (len1 > 0 && len2 > 0) {
+        int cmp = (*s1++) - (*s2++);
+        if (cmp)
+            /* This should make Christian happy! */
+            return (cmp < 0) ? -1 : (cmp != 0);
+        len1--, len2--;
+    }
+
+    return (len1 < len2) ? -1 : (len1 != len2);
+}
+
+int PyUnicode_Compare(PyObject *left,
+		      PyObject *right)
+{
+    PyUnicodeObject *u = NULL, *v = NULL;
+    int result;
+
+    /* Coerce the two arguments */
+    u = (PyUnicodeObject *)PyUnicode_FromObject(left);
+    if (u == NULL)
+	goto onError;
+    v = (PyUnicodeObject *)PyUnicode_FromObject(right);
+    if (v == NULL)
+	goto onError;
+
+    /* Shortcut for emtpy or interned objects */
+    if (v == u) {
+	Py_DECREF(u);
+	Py_DECREF(v);
+	return 0;
+    }
+
+    result = unicode_compare(u, v);
+
+    Py_DECREF(u);
+    Py_DECREF(v);
+    return result;
+
+onError:
+    Py_XDECREF(u);
+    Py_XDECREF(v);
+    return -1;
+}
+
+/* Concat to string or Unicode object giving a new Unicode object. */
+
+PyObject *PyUnicode_Concat(PyObject *left,
+			   PyObject *right)
+{
+    PyUnicodeObject *u = NULL, *v = NULL, *w;
+
+    /* Coerce the two arguments */
+    u = (PyUnicodeObject *)PyUnicode_FromObject(left);
+    if (u == NULL)
+	goto onError;
+    v = (PyUnicodeObject *)PyUnicode_FromObject(right);
+    if (v == NULL)
+	goto onError;
+
+    /* Shortcuts */
+    if (v == unicode_empty) {
+	Py_DECREF(v);
+	return (PyObject *)u;
+    }
+    if (u == unicode_empty) {
+	Py_DECREF(u);
+	return (PyObject *)v;
+    }
+
+    /* Concat the two Unicode strings */
+    w = _PyUnicode_New(u->length + v->length);
+    if (w == NULL)
+	goto onError;
+    Py_UNICODE_COPY(w->str, u->str, u->length);
+    Py_UNICODE_COPY(w->str + u->length, v->str, v->length);
+
+    Py_DECREF(u);
+    Py_DECREF(v);
+    return (PyObject *)w;
+
+onError:
+    Py_XDECREF(u);
+    Py_XDECREF(v);
+    return NULL;
+}
+
+static char count__doc__[] =
+"S.count(sub[, start[, end]]) -> int\n\
+\n\
+Return the number of occurrences of substring sub in Unicode string\n\
+S[start:end].  Optional arguments start and end are\n\
+interpreted as in slice notation.";
+
+static PyObject *
+unicode_count(PyUnicodeObject *self, PyObject *args)
+{
+    PyUnicodeObject *substring;
+    int start = 0;
+    int end = INT_MAX;
+    PyObject *result;
+
+    if (!PyArg_ParseTuple(args, "O|ii:count", &substring, &start, &end))
+        return NULL;
+
+    substring = (PyUnicodeObject *)PyUnicode_FromObject(
+						(PyObject *)substring);
+    if (substring == NULL)
+	return NULL;
+    
+    if (substring->length == 0) {
+	Py_DECREF(substring);
+        return PyInt_FromLong((long) 0);
+    }
+
+    if (start < 0)
+        start += self->length;
+    if (start < 0)
+        start = 0;
+    if (end > self->length)
+        end = self->length;
+    if (end < 0)
+        end += self->length;
+    if (end < 0)
+        end = 0;
+
+    result = PyInt_FromLong((long) count(self, start, end, substring));
+
+    Py_DECREF(substring);
+    return result;
+}
+
+static char encode__doc__[] =
+"S.encode([encoding[,errors]]) -> string\n\
+\n\
+Return an encoded string version of S. Default encoding is 'UTF-8'.\n\
+errors may be given to set a different error handling scheme. Default\n\
+is 'strict' meaning that encoding errors raise a ValueError. Other\n\
+possible values are 'ignore' and 'replace'.";
+
+static PyObject *
+unicode_encode(PyUnicodeObject *self, PyObject *args)
+{
+    char *encoding = NULL;
+    char *errors = NULL;
+    if (!PyArg_ParseTuple(args, "|ss:encode", &encoding, &errors))
+        return NULL;
+    return PyUnicode_AsEncodedString((PyObject *)self, encoding, errors);
+}
+
+static char expandtabs__doc__[] =
+"S.expandtabs([tabsize]) -> unicode\n\
+\n\
+Return a copy of S where all tab characters are expanded using spaces.\n\
+If tabsize is not given, a tab size of 8 characters is assumed.";
+
+static PyObject*
+unicode_expandtabs(PyUnicodeObject *self, PyObject *args)
+{
+    Py_UNICODE *e;
+    Py_UNICODE *p;
+    Py_UNICODE *q;
+    int i, j;
+    PyUnicodeObject *u;
+    int tabsize = 8;
+
+    if (!PyArg_ParseTuple(args, "|i:expandtabs", &tabsize))
+	return NULL;
+
+    /* First pass: determine size of ouput string */
+    i = j = 0;
+    e = self->str + self->length;
+    for (p = self->str; p < e; p++)
+        if (*p == '\t') {
+	    if (tabsize > 0)
+		j += tabsize - (j % tabsize);
+	}
+        else {
+            j++;
+            if (*p == '\n' || *p == '\r') {
+                i += j;
+                j = 0;
+            }
+        }
+
+    /* Second pass: create output string and fill it */
+    u = _PyUnicode_New(i + j);
+    if (!u)
+        return NULL;
+
+    j = 0;
+    q = u->str;
+
+    for (p = self->str; p < e; p++)
+        if (*p == '\t') {
+	    if (tabsize > 0) {
+		i = tabsize - (j % tabsize);
+		j += i;
+		while (i--)
+		    *q++ = ' ';
+	    }
+	}
+	else {
+            j++;
+	    *q++ = *p;
+            if (*p == '\n' || *p == '\r')
+                j = 0;
+        }
+
+    return (PyObject*) u;
+}
+
+static char find__doc__[] =
+"S.find(sub [,start [,end]]) -> int\n\
+\n\
+Return the lowest index in S where substring sub is found,\n\
+such that sub is contained within s[start,end].  Optional\n\
+arguments start and end are interpreted as in slice notation.\n\
+\n\
+Return -1 on failure.";
+
+static PyObject *
+unicode_find(PyUnicodeObject *self, PyObject *args)
+{
+    PyUnicodeObject *substring;
+    int start = 0;
+    int end = INT_MAX;
+    PyObject *result;
+
+    if (!PyArg_ParseTuple(args, "O|ii:find", &substring, &start, &end))
+        return NULL;
+    substring = (PyUnicodeObject *)PyUnicode_FromObject(
+						(PyObject *)substring);
+    if (substring == NULL)
+	return NULL;
+
+    result = PyInt_FromLong(findstring(self, substring, start, end, 1));
+
+    Py_DECREF(substring);
+    return result;
+}
+
+static PyObject *
+unicode_getitem(PyUnicodeObject *self, int index)
+{
+    if (index < 0 || index >= self->length) {
+        PyErr_SetString(PyExc_IndexError, "string index out of range");
+        return NULL;
+    }
+
+    return (PyObject*) PyUnicode_FromUnicode(&self->str[index], 1);
+}
+
+static long
+unicode_hash(PyUnicodeObject *self)
+{
+    long hash;
+    PyObject *utf8;
+
+    /* Since Unicode objects compare equal to their UTF-8 string
+       counterparts, they should also use the UTF-8 strings as basis
+       for their hash value. This is needed to assure that strings and
+       Unicode objects behave in the same way as dictionary
+       keys. Unfortunately, this costs some performance and also some
+       memory if the cached UTF-8 representation is not used later
+       on. */
+    if (self->hash != -1)
+	return self->hash;
+    utf8 = utf8_string(self, NULL);
+    if (utf8 == NULL)
+	return -1;
+    hash = PyObject_Hash(utf8);
+    if (hash == -1)
+	return -1;
+    self->hash = hash;
+    return hash;
+}
+
+static char index__doc__[] =
+"S.index(sub [,start [,end]]) -> int\n\
+\n\
+Like S.find() but raise ValueError when the substring is not found.";
+
+static PyObject *
+unicode_index(PyUnicodeObject *self, PyObject *args)
+{
+    int result;
+    PyUnicodeObject *substring;
+    int start = 0;
+    int end = INT_MAX;
+
+    if (!PyArg_ParseTuple(args, "O|ii:index", &substring, &start, &end))
+        return NULL;
+    
+    substring = (PyUnicodeObject *)PyUnicode_FromObject(
+						(PyObject *)substring);
+    if (substring == NULL)
+	return NULL;
+
+    result = findstring(self, substring, start, end, 1);
+
+    Py_DECREF(substring);
+    if (result < 0) {
+        PyErr_SetString(PyExc_ValueError, "substring not found");
+        return NULL;
+    }
+    return PyInt_FromLong(result);
+}
+
+static char islower__doc__[] =
+"S.islower() -> int\n\
+\n\
+Return 1 if  all cased characters in S are lowercase and there is\n\
+at least one cased character in S, 0 otherwise.";
+
+static PyObject*
+unicode_islower(PyUnicodeObject *self, PyObject *args)
+{
+    register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
+    register const Py_UNICODE *e;
+    int cased;
+
+    if (!PyArg_NoArgs(args))
+        return NULL;
+
+    /* Shortcut for single character strings */
+    if (PyUnicode_GET_SIZE(self) == 1)
+	return PyInt_FromLong(Py_UNICODE_ISLOWER(*p) != 0);
+
+    e = p + PyUnicode_GET_SIZE(self);
+    cased = 0;
+    for (; p < e; p++) {
+	register const Py_UNICODE ch = *p;
+	
+	if (Py_UNICODE_ISUPPER(ch) || Py_UNICODE_ISTITLE(ch))
+	    return PyInt_FromLong(0);
+	else if (!cased && Py_UNICODE_ISLOWER(ch))
+	    cased = 1;
+    }
+    return PyInt_FromLong(cased);
+}
+
+static char isupper__doc__[] =
+"S.isupper() -> int\n\
+\n\
+Return 1 if  all cased characters in S are uppercase and there is\n\
+at least one cased character in S, 0 otherwise.";
+
+static PyObject*
+unicode_isupper(PyUnicodeObject *self, PyObject *args)
+{
+    register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
+    register const Py_UNICODE *e;
+    int cased;
+
+    if (!PyArg_NoArgs(args))
+        return NULL;
+
+    /* Shortcut for single character strings */
+    if (PyUnicode_GET_SIZE(self) == 1)
+	return PyInt_FromLong(Py_UNICODE_ISUPPER(*p) != 0);
+
+    e = p + PyUnicode_GET_SIZE(self);
+    cased = 0;
+    for (; p < e; p++) {
+	register const Py_UNICODE ch = *p;
+	
+	if (Py_UNICODE_ISLOWER(ch) || Py_UNICODE_ISTITLE(ch))
+	    return PyInt_FromLong(0);
+	else if (!cased && Py_UNICODE_ISUPPER(ch))
+	    cased = 1;
+    }
+    return PyInt_FromLong(cased);
+}
+
+static char istitle__doc__[] =
+"S.istitle() -> int\n\
+\n\
+Return 1 if S is a titlecased string, i.e. upper- and titlecase characters\n\
+may only follow uncased characters and lowercase characters only cased\n\
+ones. Return 0 otherwise.";
+
+static PyObject*
+unicode_istitle(PyUnicodeObject *self, PyObject *args)
+{
+    register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
+    register const Py_UNICODE *e;
+    int cased, previous_is_cased;
+
+    if (!PyArg_NoArgs(args))
+        return NULL;
+
+    /* Shortcut for single character strings */
+    if (PyUnicode_GET_SIZE(self) == 1)
+	return PyInt_FromLong((Py_UNICODE_ISTITLE(*p) != 0) ||
+			      (Py_UNICODE_ISUPPER(*p) != 0));
+
+    e = p + PyUnicode_GET_SIZE(self);
+    cased = 0;
+    previous_is_cased = 0;
+    for (; p < e; p++) {
+	register const Py_UNICODE ch = *p;
+	
+	if (Py_UNICODE_ISUPPER(ch) || Py_UNICODE_ISTITLE(ch)) {
+	    if (previous_is_cased)
+		return PyInt_FromLong(0);
+	    previous_is_cased = 1;
+	    cased = 1;
+	}
+	else if (Py_UNICODE_ISLOWER(ch)) {
+	    if (!previous_is_cased)
+		return PyInt_FromLong(0);
+	    previous_is_cased = 1;
+	    cased = 1;
+	}
+	else
+	    previous_is_cased = 0;
+    }
+    return PyInt_FromLong(cased);
+}
+
+static char isspace__doc__[] =
+"S.isspace() -> int\n\
+\n\
+Return 1 if there are only whitespace characters in S,\n\
+0 otherwise.";
+
+static PyObject*
+unicode_isspace(PyUnicodeObject *self, PyObject *args)
+{
+    register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
+    register const Py_UNICODE *e;
+
+    if (!PyArg_NoArgs(args))
+        return NULL;
+
+    /* Shortcut for single character strings */
+    if (PyUnicode_GET_SIZE(self) == 1 &&
+	Py_UNICODE_ISSPACE(*p))
+	return PyInt_FromLong(1);
+
+    e = p + PyUnicode_GET_SIZE(self);
+    for (; p < e; p++) {
+	if (!Py_UNICODE_ISSPACE(*p))
+	    return PyInt_FromLong(0);
+    }
+    return PyInt_FromLong(1);
+}
+
+static char isdecimal__doc__[] =
+"S.isdecimal() -> int\n\
+\n\
+Return 1 if there are only decimal characters in S,\n\
+0 otherwise.";
+
+static PyObject*
+unicode_isdecimal(PyUnicodeObject *self, PyObject *args)
+{
+    register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
+    register const Py_UNICODE *e;
+
+    if (!PyArg_NoArgs(args))
+        return NULL;
+
+    /* Shortcut for single character strings */
+    if (PyUnicode_GET_SIZE(self) == 1 &&
+	Py_UNICODE_ISDECIMAL(*p))
+	return PyInt_FromLong(1);
+
+    e = p + PyUnicode_GET_SIZE(self);
+    for (; p < e; p++) {
+	if (!Py_UNICODE_ISDECIMAL(*p))
+	    return PyInt_FromLong(0);
+    }
+    return PyInt_FromLong(1);
+}
+
+static char isdigit__doc__[] =
+"S.isdigit() -> int\n\
+\n\
+Return 1 if there are only digit characters in S,\n\
+0 otherwise.";
+
+static PyObject*
+unicode_isdigit(PyUnicodeObject *self, PyObject *args)
+{
+    register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
+    register const Py_UNICODE *e;
+
+    if (!PyArg_NoArgs(args))
+        return NULL;
+
+    /* Shortcut for single character strings */
+    if (PyUnicode_GET_SIZE(self) == 1 &&
+	Py_UNICODE_ISDIGIT(*p))
+	return PyInt_FromLong(1);
+
+    e = p + PyUnicode_GET_SIZE(self);
+    for (; p < e; p++) {
+	if (!Py_UNICODE_ISDIGIT(*p))
+	    return PyInt_FromLong(0);
+    }
+    return PyInt_FromLong(1);
+}
+
+static char isnumeric__doc__[] =
+"S.isnumeric() -> int\n\
+\n\
+Return 1 if there are only numeric characters in S,\n\
+0 otherwise.";
+
+static PyObject*
+unicode_isnumeric(PyUnicodeObject *self, PyObject *args)
+{
+    register const Py_UNICODE *p = PyUnicode_AS_UNICODE(self);
+    register const Py_UNICODE *e;
+
+    if (!PyArg_NoArgs(args))
+        return NULL;
+
+    /* Shortcut for single character strings */
+    if (PyUnicode_GET_SIZE(self) == 1 &&
+	Py_UNICODE_ISNUMERIC(*p))
+	return PyInt_FromLong(1);
+
+    e = p + PyUnicode_GET_SIZE(self);
+    for (; p < e; p++) {
+	if (!Py_UNICODE_ISNUMERIC(*p))
+	    return PyInt_FromLong(0);
+    }
+    return PyInt_FromLong(1);
+}
+
+static char join__doc__[] =
+"S.join(sequence) -> unicode\n\
+\n\
+Return a string which is the concatenation of the strings in the\n\
+sequence.  The separator between elements is S.";
+
+static PyObject*
+unicode_join(PyUnicodeObject *self, PyObject *args)
+{
+    PyObject *data;
+    if (!PyArg_ParseTuple(args, "O:join", &data))
+        return NULL;
+
+    return PyUnicode_Join((PyObject *)self, data);
+}
+
+static int
+unicode_length(PyUnicodeObject *self)
+{
+    return self->length;
+}
+
+static char ljust__doc__[] =
+"S.ljust(width) -> unicode\n\
+\n\
+Return S left justified in a Unicode string of length width. Padding is\n\
+done using spaces.";
+
+static PyObject *
+unicode_ljust(PyUnicodeObject *self, PyObject *args)
+{
+    int width;
+    if (!PyArg_ParseTuple(args, "i:ljust", &width))
+        return NULL;
+
+    if (self->length >= width) {
+        Py_INCREF(self);
+        return (PyObject*) self;
+    }
+
+    return (PyObject*) pad(self, 0, width - self->length, ' ');
+}
+
+static char lower__doc__[] =
+"S.lower() -> unicode\n\
+\n\
+Return a copy of the string S converted to lowercase.";
+
+static PyObject*
+unicode_lower(PyUnicodeObject *self, PyObject *args)
+{
+    if (!PyArg_NoArgs(args))
+        return NULL;
+    return fixup(self, fixlower);
+}
+
+static char lstrip__doc__[] =
+"S.lstrip() -> unicode\n\
+\n\
+Return a copy of the string S with leading whitespace removed.";
+
+static PyObject *
+unicode_lstrip(PyUnicodeObject *self, PyObject *args)
+{
+    if (!PyArg_NoArgs(args))
+        return NULL;
+    return strip(self, 1, 0);
+}
+
+static PyObject*
+unicode_repeat(PyUnicodeObject *str, int len)
+{
+    PyUnicodeObject *u;
+    Py_UNICODE *p;
+
+    if (len < 0)
+        len = 0;
+
+    if (len == 1) {
+        /* no repeat, return original string */
+        Py_INCREF(str);
+        return (PyObject*) str;
+    }
+        
+    u = _PyUnicode_New(len * str->length);
+    if (!u)
+        return NULL;
+
+    p = u->str;
+
+    while (len-- > 0) {
+        Py_UNICODE_COPY(p, str->str, str->length);
+        p += str->length;
+    }
+
+    return (PyObject*) u;
+}
+
+PyObject *PyUnicode_Replace(PyObject *obj,
+			    PyObject *subobj,
+			    PyObject *replobj,
+			    int maxcount)
+{
+    PyObject *self;
+    PyObject *str1;
+    PyObject *str2;
+    PyObject *result;
+
+    self = PyUnicode_FromObject(obj);
+    if (self == NULL)
+	return NULL;
+    str1 = PyUnicode_FromObject(subobj);
+    if (str1 == NULL) {
+	Py_DECREF(self);
+	return NULL;
+    }
+    str2 = PyUnicode_FromObject(replobj);
+    if (str2 == NULL) {
+	Py_DECREF(self);
+	Py_DECREF(str1);
+	return NULL;
+    }
+    result = replace((PyUnicodeObject *)self, 
+		     (PyUnicodeObject *)str1, 
+		     (PyUnicodeObject *)str2, 
+		     maxcount);
+    Py_DECREF(self);
+    Py_DECREF(str1);
+    Py_DECREF(str2);
+    return result;
+}
+
+static char replace__doc__[] =
+"S.replace (old, new[, maxsplit]) -> unicode\n\
+\n\
+Return a copy of S with all occurrences of substring\n\
+old replaced by new.  If the optional argument maxsplit is\n\
+given, only the first maxsplit occurrences are replaced.";
+
+static PyObject*
+unicode_replace(PyUnicodeObject *self, PyObject *args)
+{
+    PyUnicodeObject *str1;
+    PyUnicodeObject *str2;
+    int maxcount = -1;
+    PyObject *result;
+
+    if (!PyArg_ParseTuple(args, "OO|i:replace", &str1, &str2, &maxcount))
+        return NULL;
+    str1 = (PyUnicodeObject *)PyUnicode_FromObject((PyObject *)str1);
+    if (str1 == NULL)
+	return NULL;
+    str2 = (PyUnicodeObject *)PyUnicode_FromObject((PyObject *)str2);
+    if (str2 == NULL)
+	return NULL;
+
+    result = replace(self, str1, str2, maxcount);
+
+    Py_DECREF(str1);
+    Py_DECREF(str2);
+    return result;
+}
+
+static
+PyObject *unicode_repr(PyObject *unicode)
+{
+    return unicodeescape_string(PyUnicode_AS_UNICODE(unicode),
+				PyUnicode_GET_SIZE(unicode),
+				1);
+}
+
+static char rfind__doc__[] =
+"S.rfind(sub [,start [,end]]) -> int\n\
+\n\
+Return the highest index in S where substring sub is found,\n\
+such that sub is contained within s[start,end].  Optional\n\
+arguments start and end are interpreted as in slice notation.\n\
+\n\
+Return -1 on failure.";
+
+static PyObject *
+unicode_rfind(PyUnicodeObject *self, PyObject *args)
+{
+    PyUnicodeObject *substring;
+    int start = 0;
+    int end = INT_MAX;
+    PyObject *result;
+
+    if (!PyArg_ParseTuple(args, "O|ii:rfind", &substring, &start, &end))
+        return NULL;
+    substring = (PyUnicodeObject *)PyUnicode_FromObject(
+						(PyObject *)substring);
+    if (substring == NULL)
+	return NULL;
+
+    result = PyInt_FromLong(findstring(self, substring, start, end, -1));
+
+    Py_DECREF(substring);
+    return result;
+}
+
+static char rindex__doc__[] =
+"S.rindex(sub [,start [,end]]) -> int\n\
+\n\
+Like S.rfind() but raise ValueError when the substring is not found.";
+
+static PyObject *
+unicode_rindex(PyUnicodeObject *self, PyObject *args)
+{
+    int result;
+    PyUnicodeObject *substring;
+    int start = 0;
+    int end = INT_MAX;
+
+    if (!PyArg_ParseTuple(args, "O|ii:rindex", &substring, &start, &end))
+        return NULL;
+    substring = (PyUnicodeObject *)PyUnicode_FromObject(
+						(PyObject *)substring);
+    if (substring == NULL)
+	return NULL;
+
+    result = findstring(self, substring, start, end, -1);
+
+    Py_DECREF(substring);
+    if (result < 0) {
+        PyErr_SetString(PyExc_ValueError, "substring not found");
+        return NULL;
+    }
+    return PyInt_FromLong(result);
+}
+
+static char rjust__doc__[] =
+"S.rjust(width) -> unicode\n\
+\n\
+Return S right justified in a Unicode string of length width. Padding is\n\
+done using spaces.";
+
+static PyObject *
+unicode_rjust(PyUnicodeObject *self, PyObject *args)
+{
+    int width;
+    if (!PyArg_ParseTuple(args, "i:rjust", &width))
+        return NULL;
+
+    if (self->length >= width) {
+        Py_INCREF(self);
+        return (PyObject*) self;
+    }
+
+    return (PyObject*) pad(self, width - self->length, 0, ' ');
+}
+
+static char rstrip__doc__[] =
+"S.rstrip() -> unicode\n\
+\n\
+Return a copy of the string S with trailing whitespace removed.";
+
+static PyObject *
+unicode_rstrip(PyUnicodeObject *self, PyObject *args)
+{
+    if (!PyArg_NoArgs(args))
+        return NULL;
+    return strip(self, 0, 1);
+}
+
+static PyObject*
+unicode_slice(PyUnicodeObject *self, int start, int end)
+{
+    /* standard clamping */
+    if (start < 0)
+        start = 0;
+    if (end < 0)
+        end = 0;
+    if (end > self->length)
+        end = self->length;
+    if (start == 0 && end == self->length) {
+        /* full slice, return original string */
+        Py_INCREF(self);
+        return (PyObject*) self;
+    }
+    if (start > end)
+        start = end;
+    /* copy slice */
+    return (PyObject*) PyUnicode_FromUnicode(self->str + start,
+					     end - start);
+}
+
+PyObject *PyUnicode_Split(PyObject *s,
+			  PyObject *sep,
+			  int maxsplit)
+{
+    PyObject *result;
+    
+    s = PyUnicode_FromObject(s);
+    if (s == NULL)
+	return NULL;
+    if (sep != NULL) {
+	sep = PyUnicode_FromObject(sep);
+	if (sep == NULL) {
+	    Py_DECREF(s);
+	    return NULL;
+	}
+    }
+
+    result = split((PyUnicodeObject *)s, (PyUnicodeObject *)sep, maxsplit);
+
+    Py_DECREF(s);
+    Py_XDECREF(sep);
+    return result;
+}
+
+static char split__doc__[] =
+"S.split([sep [,maxsplit]]) -> list of strings\n\
+\n\
+Return a list of the words in S, using sep as the\n\
+delimiter string.  If maxsplit is given, at most maxsplit\n\
+splits are done. If sep is not specified, any whitespace string\n\
+is a separator.";
+
+static PyObject*
+unicode_split(PyUnicodeObject *self, PyObject *args)
+{
+    PyObject *substring = Py_None;
+    int maxcount = -1;
+
+    if (!PyArg_ParseTuple(args, "|Oi:split", &substring, &maxcount))
+        return NULL;
+
+    if (substring == Py_None)
+	return split(self, NULL, maxcount);
+    else if (PyUnicode_Check(substring))
+	return split(self, (PyUnicodeObject *)substring, maxcount);
+    else
+	return PyUnicode_Split((PyObject *)self, substring, maxcount);
+}
+
+static char splitlines__doc__[] =
+"S.splitlines([maxsplit]]) -> list of strings\n\
+\n\
+Return a list of the lines in S, breaking at line boundaries.\n\
+If maxsplit is given, at most maxsplit are done. Line breaks are not\n\
+included in the resulting list.";
+
+static PyObject*
+unicode_splitlines(PyUnicodeObject *self, PyObject *args)
+{
+    int maxcount = -1;
+
+    if (!PyArg_ParseTuple(args, "|i:splitlines", &maxcount))
+        return NULL;
+
+    return PyUnicode_Splitlines((PyObject *)self, maxcount);
+}
+
+static
+PyObject *unicode_str(PyUnicodeObject *self)
+{
+    return PyUnicode_AsUTF8String((PyObject *)self);
+}
+
+static char strip__doc__[] =
+"S.strip() -> unicode\n\
+\n\
+Return a copy of S with leading and trailing whitespace removed.";
+
+static PyObject *
+unicode_strip(PyUnicodeObject *self, PyObject *args)
+{
+    if (!PyArg_NoArgs(args))
+        return NULL;
+    return strip(self, 1, 1);
+}
+
+static char swapcase__doc__[] =
+"S.swapcase() -> unicode\n\
+\n\
+Return a copy of S with uppercase characters converted to lowercase\n\
+and vice versa.";
+
+static PyObject*
+unicode_swapcase(PyUnicodeObject *self, PyObject *args)
+{
+    if (!PyArg_NoArgs(args))
+        return NULL;
+    return fixup(self, fixswapcase);
+}
+
+static char translate__doc__[] =
+"S.translate(table) -> unicode\n\
+\n\
+Return a copy of the string S, where all characters have been mapped\n\
+through the given translation table, which must be a mapping of\n\
+Unicode ordinals to Unicode ordinals or None. Unmapped characters\n\
+are left untouched. Characters mapped to None are deleted.";
+
+static PyObject*
+unicode_translate(PyUnicodeObject *self, PyObject *args)
+{
+    PyObject *table;
+    
+    if (!PyArg_ParseTuple(args, "O:translate", &table))
+	return NULL;
+    return PyUnicode_TranslateCharmap(self->str, 
+				      self->length,
+				      table, 
+				      "ignore");
+}
+
+static char upper__doc__[] =
+"S.upper() -> unicode\n\
+\n\
+Return a copy of S converted to uppercase.";
+
+static PyObject*
+unicode_upper(PyUnicodeObject *self, PyObject *args)
+{
+    if (!PyArg_NoArgs(args))
+        return NULL;
+    return fixup(self, fixupper);
+}
+
+#if 0
+static char zfill__doc__[] =
+"S.zfill(width) -> unicode\n\
+\n\
+Pad a numeric string x with zeros on the left, to fill a field\n\
+of the specified width. The string x is never truncated.";
+
+static PyObject *
+unicode_zfill(PyUnicodeObject *self, PyObject *args)
+{
+    int fill;
+    PyUnicodeObject *u;
+
+    int width;
+    if (!PyArg_ParseTuple(args, "i:zfill", &width))
+        return NULL;
+
+    if (self->length >= width) {
+        Py_INCREF(self);
+        return (PyObject*) self;
+    }
+
+    fill = width - self->length;
+
+    u = pad(self, fill, 0, '0');
+
+    if (u->str[fill] == '+' || u->str[fill] == '-') {
+        /* move sign to beginning of string */
+        u->str[0] = u->str[fill];
+        u->str[fill] = '0';
+    }
+
+    return (PyObject*) u;
+}
+#endif
+
+#if 0
+static PyObject*
+unicode_freelistsize(PyUnicodeObject *self, PyObject *args)
+{
+    if (!PyArg_NoArgs(args))
+        return NULL;
+    return PyInt_FromLong(unicode_freelist_size);
+}
+#endif
+
+static char startswith__doc__[] =
+"S.startswith(prefix[, start[, end]]) -> int\n\
+\n\
+Return 1 if S starts with the specified prefix, otherwise return 0.  With\n\
+optional start, test S beginning at that position.  With optional end, stop\n\
+comparing S at that position.";
+
+static PyObject *
+unicode_startswith(PyUnicodeObject *self,
+		   PyObject *args)
+{
+    PyUnicodeObject *substring;
+    int start = 0;
+    int end = INT_MAX;
+    PyObject *result;
+
+    if (!PyArg_ParseTuple(args, "O|ii:startswith", &substring, &start, &end))
+	return NULL;
+    substring = (PyUnicodeObject *)PyUnicode_FromObject(
+						(PyObject *)substring);
+    if (substring == NULL)
+	return NULL;
+
+    result = PyInt_FromLong(tailmatch(self, substring, start, end, -1));
+
+    Py_DECREF(substring);
+    return result;
+}
+
+
+static char endswith__doc__[] =
+"S.endswith(suffix[, start[, end]]) -> int\n\
+\n\
+Return 1 if S ends with the specified suffix, otherwise return 0.  With\n\
+optional start, test S beginning at that position.  With optional end, stop\n\
+comparing S at that position.";
+
+static PyObject *
+unicode_endswith(PyUnicodeObject *self,
+		 PyObject *args)
+{
+    PyUnicodeObject *substring;
+    int start = 0;
+    int end = INT_MAX;
+    PyObject *result;
+
+    if (!PyArg_ParseTuple(args, "O|ii:endswith", &substring, &start, &end))
+	return NULL;
+    substring = (PyUnicodeObject *)PyUnicode_FromObject(
+						(PyObject *)substring);
+    if (substring == NULL)
+	return NULL;
+
+    result = PyInt_FromLong(tailmatch(self, substring, start, end, +1));
+
+    Py_DECREF(substring);
+    return result;
+}
+
+
+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, 1, encode__doc__},
+    {"replace", (PyCFunction) unicode_replace, 1, replace__doc__},
+    {"split", (PyCFunction) unicode_split, 1, split__doc__},
+    {"join", (PyCFunction) unicode_join, 1, join__doc__},
+    {"capitalize", (PyCFunction) unicode_capitalize, 0, capitalize__doc__},
+    {"title", (PyCFunction) unicode_title, 0, title__doc__},
+    {"center", (PyCFunction) unicode_center, 1, center__doc__},
+    {"count", (PyCFunction) unicode_count, 1, count__doc__},
+    {"expandtabs", (PyCFunction) unicode_expandtabs, 1, expandtabs__doc__},
+    {"find", (PyCFunction) unicode_find, 1, find__doc__},
+    {"index", (PyCFunction) unicode_index, 1, index__doc__},
+    {"ljust", (PyCFunction) unicode_ljust, 1, ljust__doc__},
+    {"lower", (PyCFunction) unicode_lower, 0, lower__doc__},
+    {"lstrip", (PyCFunction) unicode_lstrip, 0, lstrip__doc__},
+/*  {"maketrans", (PyCFunction) unicode_maketrans, 1, maketrans__doc__}, */
+    {"rfind", (PyCFunction) unicode_rfind, 1, rfind__doc__},
+    {"rindex", (PyCFunction) unicode_rindex, 1, rindex__doc__},
+    {"rjust", (PyCFunction) unicode_rjust, 1, rjust__doc__},
+    {"rstrip", (PyCFunction) unicode_rstrip, 0, rstrip__doc__},
+    {"splitlines", (PyCFunction) unicode_splitlines, 1, splitlines__doc__},
+    {"strip", (PyCFunction) unicode_strip, 0, strip__doc__},
+    {"swapcase", (PyCFunction) unicode_swapcase, 0, swapcase__doc__},
+    {"translate", (PyCFunction) unicode_translate, 1, translate__doc__},
+    {"upper", (PyCFunction) unicode_upper, 0, upper__doc__},
+    {"startswith", (PyCFunction) unicode_startswith, 1, startswith__doc__},
+    {"endswith", (PyCFunction) unicode_endswith, 1, endswith__doc__},
+    {"islower", (PyCFunction) unicode_islower, 0, islower__doc__},
+    {"isupper", (PyCFunction) unicode_isupper, 0, isupper__doc__},
+    {"istitle", (PyCFunction) unicode_istitle, 0, istitle__doc__},
+    {"isspace", (PyCFunction) unicode_isspace, 0, isspace__doc__},
+    {"isdecimal", (PyCFunction) unicode_isdecimal, 0, isdecimal__doc__},
+    {"isdigit", (PyCFunction) unicode_isdigit, 0, isdigit__doc__},
+    {"isnumeric", (PyCFunction) unicode_isnumeric, 0, isnumeric__doc__},
+#if 0
+    {"zfill", (PyCFunction) unicode_zfill, 1, zfill__doc__},
+    {"capwords", (PyCFunction) unicode_capwords, 0, capwords__doc__},
+#endif
+
+#if 0
+    /* This one is just used for debugging the implementation. */
+    {"freelistsize", (PyCFunction) unicode_freelistsize, 0},
+#endif
+
+    {NULL, NULL}
+};
+
+static PyObject * 
+unicode_getattr(PyUnicodeObject *self, char *name)
+{
+    return Py_FindMethod(unicode_methods, (PyObject*) self, name);
+}
+
+static PySequenceMethods unicode_as_sequence = {
+    (inquiry) unicode_length, 		/* sq_length */
+    (binaryfunc) PyUnicode_Concat, 	/* sq_concat */
+    (intargfunc) unicode_repeat, 	/* sq_repeat */
+    (intargfunc) unicode_getitem, 	/* sq_item */
+    (intintargfunc) unicode_slice, 	/* sq_slice */
+    0, 					/* sq_ass_item */
+    0, 					/* sq_ass_slice */
+};
+
+static int
+unicode_buffer_getreadbuf(PyUnicodeObject *self,
+			  int index,
+			  const void **ptr)
+{
+    if (index != 0) {
+        PyErr_SetString(PyExc_SystemError,
+			"accessing non-existent unicode segment");
+        return -1;
+    }
+    *ptr = (void *) self->str;
+    return PyUnicode_GET_DATA_SIZE(self);
+}
+
+static int
+unicode_buffer_getwritebuf(PyUnicodeObject *self, int index,
+			   const void **ptr)
+{
+    PyErr_SetString(PyExc_TypeError,
+		    "cannot use unicode as modifyable buffer");
+    return -1;
+}
+
+static int
+unicode_buffer_getsegcount(PyUnicodeObject *self,
+			   int *lenp)
+{
+    if (lenp)
+        *lenp = PyUnicode_GET_DATA_SIZE(self);
+    return 1;
+}
+
+static int
+unicode_buffer_getcharbuf(PyUnicodeObject *self,
+			  int index,
+			  const void **ptr)
+{
+    PyObject *str;
+    
+    if (index != 0) {
+        PyErr_SetString(PyExc_SystemError,
+			"accessing non-existent unicode segment");
+        return -1;
+    }
+    str = utf8_string(self, NULL);
+    if (str == NULL)
+	return -1;
+    *ptr = (void *) PyString_AS_STRING(str);
+    return PyString_GET_SIZE(str);
+}
+
+/* Helpers for PyUnicode_Format() */
+
+static PyObject *
+getnextarg(args, arglen, p_argidx)
+    PyObject *args;
+int arglen;
+int *p_argidx;
+{
+    int argidx = *p_argidx;
+    if (argidx < arglen) {
+	(*p_argidx)++;
+	if (arglen < 0)
+	    return args;
+	else
+	    return PyTuple_GetItem(args, argidx);
+    }
+    PyErr_SetString(PyExc_TypeError,
+		    "not enough arguments for format string");
+    return NULL;
+}
+
+#define F_LJUST (1<<0)
+#define F_SIGN	(1<<1)
+#define F_BLANK (1<<2)
+#define F_ALT	(1<<3)
+#define F_ZERO	(1<<4)
+
+static
+#ifdef HAVE_STDARG_PROTOTYPES
+int usprintf(register Py_UNICODE *buffer, char *format, ...)
+#else
+int usprintf(va_alist) va_dcl
+#endif
+{
+    register int i;
+    int len;
+    va_list va;
+    char *charbuffer;
+#ifdef HAVE_STDARG_PROTOTYPES
+    va_start(va, format);
+#else
+    Py_UNICODE *args;
+    char *format;
+	
+    va_start(va);
+    buffer = va_arg(va, Py_UNICODE *);
+    format = va_arg(va, char *);
+#endif
+
+    /* First, format the string as char array, then expand to Py_UNICODE
+       array. */
+    charbuffer = (char *)buffer;
+    len = vsprintf(charbuffer, format, va);
+    for (i = len - 1; i >= 0; i--)
+	buffer[i] = (Py_UNICODE) charbuffer[i];
+
+    va_end(va);
+    return len;
+}
+
+static int
+formatfloat(Py_UNICODE *buf,
+	    int flags,
+	    int prec,
+	    int type,
+	    PyObject *v)
+{
+    char fmt[20];
+    double x;
+    
+    x = PyFloat_AsDouble(v);
+    if (x == -1.0 && PyErr_Occurred())
+	return -1;
+    if (prec < 0)
+	prec = 6;
+    if (prec > 50)
+	prec = 50; /* Arbitrary limitation */
+    if (type == 'f' && (fabs(x) / 1e25) >= 1e25)
+	type = 'g';
+    sprintf(fmt, "%%%s.%d%c", (flags & F_ALT) ? "#" : "", prec, type);
+    return usprintf(buf, fmt, x);
+}
+
+static int
+formatint(Py_UNICODE *buf,
+	  int flags,
+	  int prec,
+	  int type,
+	  PyObject *v)
+{
+    char fmt[20];
+    long x;
+
+    x = PyInt_AsLong(v);
+    if (x == -1 && PyErr_Occurred())
+	return -1;
+    if (prec < 0)
+	prec = 1;
+    sprintf(fmt, "%%%s.%dl%c", (flags & F_ALT) ? "#" : "", prec, type);
+    return usprintf(buf, fmt, x);
+}
+
+static int
+formatchar(Py_UNICODE *buf,
+	   PyObject *v)
+{
+    if (PyUnicode_Check(v))
+	buf[0] = PyUnicode_AS_UNICODE(v)[0];
+
+    else if (PyString_Check(v))
+	buf[0] = (Py_UNICODE) PyString_AS_STRING(v)[0];
+
+    else {
+	/* Integer input truncated to a character */
+        long x;
+	x = PyInt_AsLong(v);
+	if (x == -1 && PyErr_Occurred())
+	    return -1;
+	buf[0] = (char) x;
+    }
+    buf[1] = '\0';
+    return 1;
+}
+
+PyObject *PyUnicode_Format(PyObject *format,
+			   PyObject *args)
+{
+    Py_UNICODE *fmt, *res;
+    int fmtcnt, rescnt, reslen, arglen, argidx;
+    int args_owned = 0;
+    PyUnicodeObject *result = NULL;
+    PyObject *dict = NULL;
+    PyObject *uformat;
+	
+    if (format == NULL || args == NULL) {
+	PyErr_BadInternalCall();
+	return NULL;
+    }
+    uformat = PyUnicode_FromObject(format);
+    fmt = PyUnicode_AS_UNICODE(uformat);
+    fmtcnt = PyUnicode_GET_SIZE(uformat);
+
+    reslen = rescnt = fmtcnt + 100;
+    result = _PyUnicode_New(reslen);
+    if (result == NULL)
+	goto onError;
+    res = PyUnicode_AS_UNICODE(result);
+
+    if (PyTuple_Check(args)) {
+	arglen = PyTuple_Size(args);
+	argidx = 0;
+    }
+    else {
+	arglen = -1;
+	argidx = -2;
+    }
+    if (args->ob_type->tp_as_mapping)
+	dict = args;
+
+    while (--fmtcnt >= 0) {
+	if (*fmt != '%') {
+	    if (--rescnt < 0) {
+		rescnt = fmtcnt + 100;
+		reslen += rescnt;
+		if (_PyUnicode_Resize(result, reslen) < 0)
+		    return NULL;
+		res = PyUnicode_AS_UNICODE(result) + reslen - rescnt;
+		--rescnt;
+	    }
+	    *res++ = *fmt++;
+	}
+	else {
+	    /* Got a format specifier */
+	    int flags = 0;
+	    int width = -1;
+	    int prec = -1;
+	    int size = 0;
+	    Py_UNICODE c = '\0';
+	    Py_UNICODE fill;
+	    PyObject *v = NULL;
+	    PyObject *temp = NULL;
+	    Py_UNICODE *buf;
+	    Py_UNICODE sign;
+	    int len;
+	    Py_UNICODE tmpbuf[120]; /* For format{float,int,char}() */
+
+	    fmt++;
+	    if (*fmt == '(') {
+		Py_UNICODE *keystart;
+		int keylen;
+		PyObject *key;
+		int pcount = 1;
+
+		if (dict == NULL) {
+		    PyErr_SetString(PyExc_TypeError,
+				    "format requires a mapping"); 
+		    goto onError;
+		}
+		++fmt;
+		--fmtcnt;
+		keystart = fmt;
+		/* Skip over balanced parentheses */
+		while (pcount > 0 && --fmtcnt >= 0) {
+		    if (*fmt == ')')
+			--pcount;
+		    else if (*fmt == '(')
+			++pcount;
+		    fmt++;
+		}
+		keylen = fmt - keystart - 1;
+		if (fmtcnt < 0 || pcount > 0) {
+		    PyErr_SetString(PyExc_ValueError,
+				    "incomplete format key");
+		    goto onError;
+		}
+		/* keys are converted to strings (using UTF-8) and
+		   then looked up since Python uses strings to hold
+		   variables names etc. in its namespaces and we
+		   wouldn't want to break common idioms.  The
+		   alternative would be using Unicode objects for the
+		   lookup but u"abc" and "abc" have different hash
+		   values (on purpose). */
+		key = PyUnicode_EncodeUTF8(keystart,
+					   keylen,
+					   NULL);
+		if (key == NULL)
+		    goto onError;
+		if (args_owned) {
+		    Py_DECREF(args);
+		    args_owned = 0;
+		}
+		args = PyObject_GetItem(dict, key);
+		Py_DECREF(key);
+		if (args == NULL) {
+		    goto onError;
+		}
+		args_owned = 1;
+		arglen = -1;
+		argidx = -2;
+	    }
+	    while (--fmtcnt >= 0) {
+		switch (c = *fmt++) {
+		case '-': flags |= F_LJUST; continue;
+		case '+': flags |= F_SIGN; continue;
+		case ' ': flags |= F_BLANK; continue;
+		case '#': flags |= F_ALT; continue;
+		case '0': flags |= F_ZERO; continue;
+		}
+		break;
+	    }
+	    if (c == '*') {
+		v = getnextarg(args, arglen, &argidx);
+		if (v == NULL)
+		    goto onError;
+		if (!PyInt_Check(v)) {
+		    PyErr_SetString(PyExc_TypeError,
+				    "* wants int");
+		    goto onError;
+		}
+		width = PyInt_AsLong(v);
+		if (width < 0) {
+		    flags |= F_LJUST;
+		    width = -width;
+		}
+		if (--fmtcnt >= 0)
+		    c = *fmt++;
+	    }
+	    else if (c >= '0' && c <= '9') {
+		width = c - '0';
+		while (--fmtcnt >= 0) {
+		    c = *fmt++;
+		    if (c < '0' || c > '9')
+			break;
+		    if ((width*10) / 10 != width) {
+			PyErr_SetString(PyExc_ValueError,
+					"width too big");
+			goto onError;
+		    }
+		    width = width*10 + (c - '0');
+		}
+	    }
+	    if (c == '.') {
+		prec = 0;
+		if (--fmtcnt >= 0)
+		    c = *fmt++;
+		if (c == '*') {
+		    v = getnextarg(args, arglen, &argidx);
+		    if (v == NULL)
+			goto onError;
+		    if (!PyInt_Check(v)) {
+			PyErr_SetString(PyExc_TypeError,
+					"* wants int");
+			goto onError;
+		    }
+		    prec = PyInt_AsLong(v);
+		    if (prec < 0)
+			prec = 0;
+		    if (--fmtcnt >= 0)
+			c = *fmt++;
+		}
+		else if (c >= '0' && c <= '9') {
+		    prec = c - '0';
+		    while (--fmtcnt >= 0) {
+			c = Py_CHARMASK(*fmt++);
+			if (c < '0' || c > '9')
+			    break;
+			if ((prec*10) / 10 != prec) {
+			    PyErr_SetString(PyExc_ValueError,
+					    "prec too big");
+			    goto onError;
+			}
+			prec = prec*10 + (c - '0');
+		    }
+		}
+	    } /* prec */
+	    if (fmtcnt >= 0) {
+		if (c == 'h' || c == 'l' || c == 'L') {
+		    size = c;
+		    if (--fmtcnt >= 0)
+			c = *fmt++;
+		}
+	    }
+	    if (fmtcnt < 0) {
+		PyErr_SetString(PyExc_ValueError,
+				"incomplete format");
+		goto onError;
+	    }
+	    if (c != '%') {
+		v = getnextarg(args, arglen, &argidx);
+		if (v == NULL)
+		    goto onError;
+	    }
+	    sign = 0;
+	    fill = ' ';
+	    switch (c) {
+
+	    case '%':
+		buf = tmpbuf;
+		buf[0] = '%';
+		len = 1;
+		break;
+
+	    case 's':
+	    case 'r':
+		if (PyUnicode_Check(v) && c == 's') {
+		    temp = v;
+		    Py_INCREF(temp);
+		}
+		else {
+		    PyObject *unicode;
+		    if (c == 's')
+			temp = PyObject_Str(v);
+		    else
+			temp = PyObject_Repr(v);
+		    if (temp == NULL)
+			goto onError;
+		    if (!PyString_Check(temp)) {
+			/* XXX Note: this should never happen, since
+   			       PyObject_Repr() and PyObject_Str() assure
+			       this */
+			Py_DECREF(temp);
+			PyErr_SetString(PyExc_TypeError,
+					"%s argument has non-string str()");
+			goto onError;
+		    }
+		    unicode = PyUnicode_DecodeUTF8(PyString_AS_STRING(temp),
+						   PyString_GET_SIZE(temp),
+						   "strict");
+		    Py_DECREF(temp);
+		    temp = unicode;
+		    if (temp == NULL)
+			goto onError;
+		}
+		buf = PyUnicode_AS_UNICODE(temp);
+		len = PyUnicode_GET_SIZE(temp);
+		if (prec >= 0 && len > prec)
+		    len = prec;
+		break;
+
+	    case 'i':
+	    case 'd':
+	    case 'u':
+	    case 'o':
+	    case 'x':
+	    case 'X':
+		if (c == 'i')
+		    c = 'd';
+		buf = tmpbuf;
+		len = formatint(buf, flags, prec, c, v);
+		if (len < 0)
+		    goto onError;
+		sign = (c == 'd');
+		if (flags & F_ZERO) {
+		    fill = '0';
+		    if ((flags&F_ALT) &&
+			(c == 'x' || c == 'X') &&
+			buf[0] == '0' && buf[1] == c) {
+			*res++ = *buf++;
+			*res++ = *buf++;
+			rescnt -= 2;
+			len -= 2;
+			width -= 2;
+			if (width < 0)
+			    width = 0;
+		    }
+		}
+		break;
+
+	    case 'e':
+	    case 'E':
+	    case 'f':
+	    case 'g':
+	    case 'G':
+		buf = tmpbuf;
+		len = formatfloat(buf, flags, prec, c, v);
+		if (len < 0)
+		    goto onError;
+		sign = 1;
+		if (flags&F_ZERO)
+		    fill = '0';
+		break;
+
+	    case 'c':
+		buf = tmpbuf;
+		len = formatchar(buf, v);
+		if (len < 0)
+		    goto onError;
+		break;
+
+	    default:
+		PyErr_Format(PyExc_ValueError,
+			     "unsupported format character '%c' (0x%x)",
+			     c, c);
+		goto onError;
+	    }
+	    if (sign) {
+		if (*buf == '-' || *buf == '+') {
+		    sign = *buf++;
+		    len--;
+		}
+		else if (flags & F_SIGN)
+		    sign = '+';
+		else if (flags & F_BLANK)
+		    sign = ' ';
+		else
+		    sign = 0;
+	    }
+	    if (width < len)
+		width = len;
+	    if (rescnt < width + (sign != 0)) {
+		reslen -= rescnt;
+		rescnt = width + fmtcnt + 100;
+		reslen += rescnt;
+		if (_PyUnicode_Resize(result, reslen) < 0)
+		    return NULL;
+		res = PyUnicode_AS_UNICODE(result)
+		    + reslen - rescnt;
+	    }
+	    if (sign) {
+		if (fill != ' ')
+		    *res++ = sign;
+		rescnt--;
+		if (width > len)
+		    width--;
+	    }
+	    if (width > len && !(flags & F_LJUST)) {
+		do {
+		    --rescnt;
+		    *res++ = fill;
+		} while (--width > len);
+	    }
+	    if (sign && fill == ' ')
+		*res++ = sign;
+	    memcpy(res, buf, len * sizeof(Py_UNICODE));
+	    res += len;
+	    rescnt -= len;
+	    while (--width >= len) {
+		--rescnt;
+		*res++ = ' ';
+	    }
+	    if (dict && (argidx < arglen) && c != '%') {
+		PyErr_SetString(PyExc_TypeError,
+				"not all arguments converted");
+		goto onError;
+	    }
+	    Py_XDECREF(temp);
+	} /* '%' */
+    } /* until end */
+    if (argidx < arglen && !dict) {
+	PyErr_SetString(PyExc_TypeError,
+			"not all arguments converted");
+	goto onError;
+    }
+
+    if (args_owned) {
+	Py_DECREF(args);
+    }
+    Py_DECREF(uformat);
+    _PyUnicode_Resize(result, reslen - rescnt);
+    return (PyObject *)result;
+
+ onError:
+    Py_XDECREF(result);
+    Py_DECREF(uformat);
+    if (args_owned) {
+	Py_DECREF(args);
+    }
+    return NULL;
+}
+
+static PyBufferProcs unicode_as_buffer = {
+    (getreadbufferproc) unicode_buffer_getreadbuf,
+    (getwritebufferproc) unicode_buffer_getwritebuf,
+    (getsegcountproc) unicode_buffer_getsegcount,
+    (getcharbufferproc) unicode_buffer_getcharbuf,
+};
+
+PyTypeObject PyUnicode_Type = {
+    PyObject_HEAD_INIT(&PyType_Type)
+    0, 					/* ob_size */
+    "unicode", 				/* tp_name */
+    sizeof(PyUnicodeObject), 		/* tp_size */
+    0, 					/* tp_itemsize */
+    /* Slots */
+    (destructor)_PyUnicode_Free, 	/* tp_dealloc */
+    0, 					/* tp_print */
+    (getattrfunc)unicode_getattr, 	/* tp_getattr */
+    0, 					/* tp_setattr */
+    (cmpfunc) unicode_compare, 		/* tp_compare */
+    (reprfunc) unicode_repr, 		/* tp_repr */
+    0, 					/* tp_as_number */
+    &unicode_as_sequence, 		/* tp_as_sequence */
+    0, 					/* tp_as_mapping */
+    (hashfunc) unicode_hash, 		/* tp_hash*/
+    0, 					/* tp_call*/
+    (reprfunc) unicode_str,	 	/* tp_str */
+    (getattrofunc) NULL, 		/* tp_getattro */
+    (setattrofunc) NULL, 		/* tp_setattro */
+    &unicode_as_buffer,			/* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT,			/* tp_flags */
+};
+
+/* Initialize the Unicode implementation */
+
+void _PyUnicode_Init()
+{
+    /* Doublecheck the configuration... */
+    if (sizeof(Py_UNICODE) != 2)
+        Py_FatalError("Unicode configuration error: "
+		      "sizeof(Py_UNICODE) != 2 bytes");
+
+    unicode_empty = _PyUnicode_New(0);
+}
+
+/* Finalize the Unicode implementation */
+
+void
+_PyUnicode_Fini()
+{
+    PyUnicodeObject *u = unicode_freelist;
+
+    while (u != NULL) {
+	PyUnicodeObject *v = u;
+	u = *(PyUnicodeObject **)u;
+	free(v);
+    }
+    Py_XDECREF(unicode_empty);
+}