[Python-3000-checkins] r55780 - python/branches/py3k-struni/Python/sysmodule.c

[walter.doerwald]

Author: walter.doerwald
Date: Tue Jun  5 22:15:52 2007
New Revision: 55780

Modified:
   python/branches/py3k-struni/Python/sysmodule.c
Log:
Change getdefaultencoding() and getfilesystemencoding()
to return unicode strings.


Modified: python/branches/py3k-struni/Python/sysmodule.c
==============================================================================
--- python/branches/py3k-struni/Python/sysmodule.c      (original)
+++ python/branches/py3k-struni/Python/sysmodule.c      Tue Jun  5 22:15:52 2007
@@ -214,7 +214,7 @@
 static PyObject *
 sys_getdefaultencoding(PyObject *self)
 {
-       return PyString_FromString(PyUnicode_GetDefaultEncoding());
+       return PyUnicode_FromString(PyUnicode_GetDefaultEncoding());
 }
 
 PyDoc_STRVAR(getdefaultencoding_doc,
@@ -246,7 +246,7 @@
 sys_getfilesystemencoding(PyObject *self)
 {
        if (Py_FileSystemDefaultEncoding)
-               return PyString_FromString(Py_FileSystemDefaultEncoding);
+               return PyUnicode_FromString(Py_FileSystemDefaultEncoding);
        Py_INCREF(Py_None);
        return Py_None;
 }
_______________________________________________
Python-3000-checkins mailing list
Python-3000-checkins@python.org
http://mail.python.org/mailman/listinfo/python-3000-checkins