--- ../../../Python-3.1b1-a/Modules/_io/textio.c	2009-05-01 22:40:59.000000000 +0200
+++ textio.c	2009-05-14 07:40:49.000000000 +0200
@@ -849,7 +849,10 @@
                 */
                 if (PyErr_ExceptionMatches(PyExc_ImportError)) {
                     PyErr_Clear();
-                    self->encoding = PyUnicode_FromString("ascii");
+                    if (Py_FileSystemDefaultEncoding)
+                        self->encoding = PyUnicode_FromString(Py_FileSystemDefaultEncoding);
+                    else
+                        self->encoding = PyUnicode_FromString("ascii");
                 }
                 else
                     goto error;