@@ -466,7 +466,7 @@ PyAPI_FUNC(long) _Py_HashDouble(double);
 PyAPI_FUNC(long) _Py_HashPointer(void*);
 
 /* Helper for passing objects to printf and the like */
-#define PyObject_REPR(obj) PyUnicode_AsString(PyObject_Repr(obj))
+#define PyObject_REPR(obj) _PyUnicode_AsString(PyObject_Repr(obj))
 
 /* Flag bits for printing: */
 #define Py_PRINT_RAW	1	/* No string quotes etc. */
 
@@ -704,22 +704,33 @@ PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefaultAndSize(
 
    In case of an error, no *size is set.
 
+   *** This API is for interpreter INTERNAL USE ONLY and will likely
+   *** be removed or changed for Python 3.1.
+
+   *** If you need to access the Unicode object as UTF-8 bytes string,
+   *** please use PyUnicode_AsUTF8String() instead.
+
 */
 
-PyAPI_FUNC(char *) PyUnicode_AsStringAndSize(
+PyAPI_FUNC(char *) _PyUnicode_AsStringAndSize(
     PyObject *unicode, 
     Py_ssize_t *size);
 
 /* Returns a pointer to the default encoding (normally, UTf-8) of the
    Unicode object unicode.
 
    Use of this API is DEPRECATED since no size information can be
-   extracted from the returned data. Use PyUnicode_AsStringAndSize()
-   instead.
+   extracted from the returned data.
+
+   *** This API is for interpreter INTERNAL USE ONLY and will likely
+   *** be removed or changed for Python 3.1.
+
+   *** If you need to access the Unicode object as UTF-8 bytes string,
+   *** please use PyUnicode_AsUTF8String() instead.
 
 */
 
-PyAPI_FUNC(char *) PyUnicode_AsString(PyObject *unicode);
+PyAPI_FUNC(char *) _PyUnicode_AsString(PyObject *unicode);
 
 /* Returns the currently active default encoding.
 
 
@@ -15,6 +15,14 @@ Core and Builtins
 - Issue #1819: function calls with several named parameters are now on
   average 35% faster (as measured by pybench).
 
+- The undocumented C APIs PyUnicode_AsString() and
+  PyUnicode_AsStringAndSize() were made private to the interpreter, in
+  order to be able to refine their interfaces for Python 3.1.
+
+  If you need to access the UTF-8 representation of a Unicode object
+  as bytes string, please use PyUnicode_AsUTF8String() instead.
+
+
 Library
 -------
 
 
@@ -683,8 +683,8 @@ StructType_setattro(PyObject *self, PyObject *key, PyObject *value)
 		return -1;
 
 	if (value && PyUnicode_Check(key) &&
-	    /* XXX struni PyUnicode_AsString can fail (also in other places)! */
-	    0 == strcmp(PyUnicode_AsString(key), "_fields_"))
+	    /* XXX struni _PyUnicode_AsString can fail (also in other places)! */
+	    0 == strcmp(_PyUnicode_AsString(key), "_fields_"))
 		return StructUnionType_update_stgdict(self, value, 1);
 	return 0;
 }
@@ -698,7 +698,7 @@ UnionType_setattro(PyObject *self, PyObject *key, PyObject *value)
 		return -1;
 
 	if (PyUnicode_Check(key) &&
-	    0 == strcmp(PyUnicode_AsString(key), "_fields_"))
+	    0 == strcmp(_PyUnicode_AsString(key), "_fields_"))
 		return StructUnionType_update_stgdict(self, value, 0);
 	return 0;
 }
@@ -1681,7 +1681,7 @@ c_void_p_from_param(PyObject *type, PyObject *value)
 	if (stgd && CDataObject_Check(value) && stgd->proto && PyUnicode_Check(stgd->proto)) {
 		PyCArgObject *parg;
 
-		switch (PyUnicode_AsString(stgd->proto)[0]) {
+		switch (_PyUnicode_AsString(stgd->proto)[0]) {
 		case 'z': /* c_char_p */
 		case 'Z': /* c_wchar_p */
 			parg = new_CArgObject();
@@ -1791,7 +1791,7 @@ SimpleType_paramfunc(CDataObject *self)
 
 	dict = PyObject_stgdict((PyObject *)self);
 	assert(dict); /* Cannot be NULL for CDataObject instances */
-	fmt = PyUnicode_AsString(dict->proto);
+	fmt = _PyUnicode_AsString(dict->proto);
 	assert(fmt);
 
 	fd = getentry(fmt);
@@ -2012,7 +2012,7 @@ SimpleType_from_param(PyObject *type, PyObject *value)
 	assert(dict);
 
 	/* I think we can rely on this being a one-character string */
-	fmt = PyUnicode_AsString(dict->proto);
+	fmt = _PyUnicode_AsString(dict->proto);
 	assert(fmt);
 
 	fd = getentry(fmt);
@@ -3058,7 +3058,7 @@ _check_outarg_type(PyObject *arg, Py_ssize_t index)
 	    /* simple pointer types, c_void_p, c_wchar_p, BSTR, ... */
 	    && PyUnicode_Check(dict->proto)
 /* We only allow c_void_p, c_char_p and c_wchar_p as a simple output parameter type */
-	    && (strchr("PzZ", PyUnicode_AsString(dict->proto)[0]))) {
+	    && (strchr("PzZ", _PyUnicode_AsString(dict->proto)[0]))) {
 		return 1;
 	}
 
@@ -3148,7 +3148,7 @@ _get_name(PyObject *obj, char **pname)
 		return *pname ? 1 : 0;
 	}
 	if (PyUnicode_Check(obj)) {
-		*pname = PyUnicode_AsString(obj);
+		*pname = _PyUnicode_AsString(obj);
 		return *pname ? 1 : 0;
 	}
 	PyErr_SetString(PyExc_TypeError,
@@ -5127,7 +5127,7 @@ cast_check_pointertype(PyObject *arg)
 	dict = PyType_stgdict(arg);
 	if (dict) {
 		if (PyUnicode_Check(dict->proto)
-		    && (strchr("sPzUZXO", PyUnicode_AsString(dict->proto)[0]))) {
+		    && (strchr("sPzUZXO", _PyUnicode_AsString(dict->proto)[0]))) {
 			/* simple pointer types, c_void_p, c_wchar_p, BSTR, ... */
 			return 1;
 		}
 
@@ -1750,7 +1750,7 @@ POINTER(PyObject *self, PyObject *cls)
 		return result;
 	}
 	if (PyUnicode_CheckExact(cls)) {
-		char *name = PyUnicode_AsString(cls);
+		char *name = _PyUnicode_AsString(cls);
 		buf = alloca(strlen(name) + 3 + 1);
 		sprintf(buf, "LP_%s", name);
 		result = PyObject_CallFunction((PyObject *)Py_TYPE(&Pointer_Type),
 
@@ -479,7 +479,7 @@ StructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct)
 			bitsize = 0;
 		if (isStruct && !isPacked) {
 			char *fieldfmt = dict->format ? dict->format : "B";
-			char *fieldname = PyUnicode_AsString(name);
+			char *fieldname = _PyUnicode_AsString(name);
 			char *ptr;
 			Py_ssize_t len = strlen(fieldname) + strlen(fieldfmt);
 			char *buf = alloca(len + 2 + 1);
 
@@ -1303,7 +1303,7 @@ element_getattro(ElementObject* self, PyObject* nameobj)
     char *name = "";
 
     if (PyUnicode_Check(nameobj))
-	name = PyUnicode_AsString(nameobj);
+	name = _PyUnicode_AsString(nameobj);
 
     if (strcmp(name, "tag") == 0)
 	res = self->tag;
@@ -2529,7 +2529,7 @@ xmlparser_getattro(XMLParserObject* self, PyObject* nameobj)
     char *name = "";
 
     if (PyUnicode_Check(nameobj))
-	name = PyUnicode_AsString(nameobj);
+	name = _PyUnicode_AsString(nameobj);
 
     PyErr_Clear();
 
 
@@ -38,7 +38,7 @@ convert_to_OSType(PyObject *v, OSType *pr)
 			"OSType arg must be string of 4 chars");
         return 0;
     }
-    memcpy((char *)&tmp, PyUnicode_AsString(v), 4);
+    memcpy((char *)&tmp, _PyUnicode_AsString(v), 4);
     *pr = (OSType)ntohl(tmp);
     return 1;
 }
 
@@ -241,7 +241,7 @@ EVP_repr(PyObject *self)
 {
     char buf[100];
     PyOS_snprintf(buf, sizeof(buf), "<%s HASH object @ %p>",
-            PyUnicode_AsString(((EVPobject *)self)->name), self);
+            _PyUnicode_AsString(((EVPobject *)self)->name), self);
     return PyUnicode_FromString(buf);
 }
 
 
@@ -180,7 +180,7 @@ normalizeUserObj(PyObject *obj)
 		PyObject *mod = fn->m_module;
 		const char *modname;
 		if (mod && PyUnicode_Check(mod)) {
-			modname = PyUnicode_AsString(mod);
+			modname = _PyUnicode_AsString(mod);
 		}
 		else if (mod && PyModule_Check(mod)) {
 			modname = PyModule_GetName(mod);
Original file line number	Diff line number	Diff line change
`@@ -1750,7 +1750,7 @@ POINTER(PyObject self, PyObject cls)`
`1750`	`1750`	`return result;`
`1751`	`1751`	`}`
`1752`	`1752`	`if (PyUnicode_CheckExact(cls)) {`
`1753`		`- char *name = PyUnicode_AsString(cls);`
	`1753`	`+ char *name = _PyUnicode_AsString(cls);`
`1754`	`1754`	`buf = alloca(strlen(name) + 3 + 1);`
`1755`	`1755`	`sprintf(buf, "LP_%s", name);`
`1756`	`1756`	`result = PyObject_CallFunction((PyObject *)Py_TYPE(&Pointer_Type),`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ convert_to_OSType(PyObject v, OSType pr)`
`38`	`38`	`"OSType arg must be string of 4 chars");`
`39`	`39`	`return 0;`
`40`	`40`	`}`
`41`		`- memcpy((char *)&tmp, PyUnicode_AsString(v), 4);`
	`41`	`+ memcpy((char *)&tmp, _PyUnicode_AsString(v), 4);`
`42`	`42`	`*pr = (OSType)ntohl(tmp);`
`43`	`43`	`return 1;`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ EVP_repr(PyObject *self)`
`241`	`241`	`{`
`242`	`242`	`char buf[100];`
`243`	`243`	`PyOS_snprintf(buf, sizeof(buf), "<%s HASH object @ %p>",`
`244`		`- PyUnicode_AsString(((EVPobject *)self)->name), self);`
	`244`	`+ _PyUnicode_AsString(((EVPobject *)self)->name), self);`
`245`	`245`	`return PyUnicode_FromString(buf);`
`246`	`246`	`}`
`247`	`247`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ normalizeUserObj(PyObject *obj)`
`180`	`180`	`PyObject *mod = fn->m_module;`
`181`	`181`	`const char *modname;`
`182`	`182`	`if (mod && PyUnicode_Check(mod)) {`
`183`		`- modname = PyUnicode_AsString(mod);`
	`183`	`+ modname = _PyUnicode_AsString(mod);`
`184`	`184`	`}`
`185`	`185`	`else if (mod && PyModule_Check(mod)) {`
`186`	`186`	`modname = PyModule_GetName(mod);`