Change getdefaultencoding() and getfilesystemencoding()

to return unicode strings.

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 9eebc14b59b850e3d9384eaa009f71a3b400a1fe..17568349d5182277fb56eea81e15140a7aa7e6d5 100644 (file)
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -214,7 +214,7 @@ exit status will be one (i.e., failure)."
 static PyObject *
 sys_getdefaultencoding(PyObject *self)
 {
-       return PyString_FromString(PyUnicode_GetDefaultEncoding());
+       return PyUnicode_FromString(PyUnicode_GetDefaultEncoding());
 }
 
 PyDoc_STRVAR(getdefaultencoding_doc,
@@ -246,7 +246,7 @@ static PyObject *
 sys_getfilesystemencoding(PyObject *self)
 {
        if (Py_FileSystemDefaultEncoding)
-               return PyString_FromString(Py_FileSystemDefaultEncoding);
+               return PyUnicode_FromString(Py_FileSystemDefaultEncoding);
        Py_INCREF(Py_None);
        return Py_None;
 }