diff -r 4e186581fea7 Doc/c-api/unicode.rst --- a/Doc/c-api/unicode.rst Wed May 01 00:17:45 2013 +0200 +++ b/Doc/c-api/unicode.rst Tue Apr 30 22:15:03 2013 -0400 @@ -727,8 +727,11 @@ .. c:function:: PyObject* PyUnicode_FromObject(PyObject *obj) - Shortcut for ``PyUnicode_FromEncodedObject(obj, NULL, "strict")`` which is used - throughout the interpreter whenever coercion to Unicode is needed. + Checks if the passed in object is already a Unicode object, and if so returns the + reference with incremented refcount. Otherwise it coerces *obj* to a Unicode object + and returns the reference. + + Objects other than Unicode or its subtypes will cause a :exc:`TypeError`. Locale Encoding