mirror of https://github.com/python/cpython
Change getdefaultencoding() and getfilesystemencoding()
to return unicode strings.
This commit is contained in:
parent
e7efd59390
commit
360b01a663
|
@ -214,7 +214,7 @@ exit status will be one (i.e., failure)."
|
||||||
static PyObject *
|
static PyObject *
|
||||||
sys_getdefaultencoding(PyObject *self)
|
sys_getdefaultencoding(PyObject *self)
|
||||||
{
|
{
|
||||||
return PyString_FromString(PyUnicode_GetDefaultEncoding());
|
return PyUnicode_FromString(PyUnicode_GetDefaultEncoding());
|
||||||
}
|
}
|
||||||
|
|
||||||
PyDoc_STRVAR(getdefaultencoding_doc,
|
PyDoc_STRVAR(getdefaultencoding_doc,
|
||||||
|
@ -246,7 +246,7 @@ static PyObject *
|
||||||
sys_getfilesystemencoding(PyObject *self)
|
sys_getfilesystemencoding(PyObject *self)
|
||||||
{
|
{
|
||||||
if (Py_FileSystemDefaultEncoding)
|
if (Py_FileSystemDefaultEncoding)
|
||||||
return PyString_FromString(Py_FileSystemDefaultEncoding);
|
return PyUnicode_FromString(Py_FileSystemDefaultEncoding);
|
||||||
Py_INCREF(Py_None);
|
Py_INCREF(Py_None);
|
||||||
return Py_None;
|
return Py_None;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue