From: Walter Dörwald <walter@livinglogic.de>
Date: Tue, 5 Jun 2007 20:15:52 +0000 (+0000)
Subject: Change getdefaultencoding() and getfilesystemencoding()
X-Git-Tag: v3.0a1~829
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=360b01a6630e0d129ef0f00ddae1a9d054f9d8d5;p=python

Change getdefaultencoding() and getfilesystemencoding()
to return unicode strings.
---

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 9eebc14b59..17568349d5 100644
--- 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;
 }