Change getdefaultencoding() and getfilesystemencoding()

doerwalter · doerwalter · commit 360b01a6630e · 2007-06-05T20:15:52.000Z
to return unicode strings.
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ exit status will be one (i.e., failure)."`
`214`	`214`	`static PyObject *`
`215`	`215`	`sys_getdefaultencoding(PyObject *self)`
`216`	`216`	`{`
`217`		`- return PyString_FromString(PyUnicode_GetDefaultEncoding());`
	`217`	`+ return PyUnicode_FromString(PyUnicode_GetDefaultEncoding());`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`PyDoc_STRVAR(getdefaultencoding_doc,`
`@@ -246,7 +246,7 @@ static PyObject *`
`246`	`246`	`sys_getfilesystemencoding(PyObject *self)`
`247`	`247`	`{`
`248`	`248`	`if (Py_FileSystemDefaultEncoding)`
`249`		`- return PyString_FromString(Py_FileSystemDefaultEncoding);`
	`249`	`+ return PyUnicode_FromString(Py_FileSystemDefaultEncoding);`
`250`	`250`	`Py_INCREF(Py_None);`
`251`	`251`	`return Py_None;`
`252`	`252`	`}`