Author: martin.v.loewis
Date: Tue Sep 4 07:24:49 2007
New Revision: 57947
Modified:
python/branches/py3k/Python/bltinmodule.c
Log:
Decode input() with stdin.encoding. Fixes #1097.
Modified: python/branches/py3k/Python/bltinmodule.c
==============================================================================
--- python/branches/py3k/Python/bltinmodule.c (original)
+++ python/branches/py3k/Python/bltinmodule.c Tue Sep 4 07:24:49 2007
@@ -1314,7 +1314,14 @@
PyObject *po;
char *prompt;
char *s;
+ PyObject *stdin_encoding;
PyObject *result;
+
+ stdin_encoding = PyObject_GetAttrString(fin, "encoding");
+ if (!stdin_encoding)
+ /* stdin is a text stream, so it must have an
+ encoding. */
+ return NULL;
tmp = PyObject_CallMethod(fout, "flush", "");
if (tmp == NULL)
PyErr_Clear();
@@ -1322,10 +1329,13 @@
Py_DECREF(tmp);
if (promptarg != NULL) {
po = PyObject_Str(promptarg);
- if (po == NULL)
+ if (po == NULL) {
+ Py_DECREF(stdin_encoding);
return NULL;
+ }
prompt = PyString_AsString(po);
if (prompt == NULL) {
+ Py_DECREF(stdin_encoding);
Py_DECREF(po);
return NULL;
}
@@ -1339,6 +1349,7 @@
if (s == NULL) {
if (!PyErr_Occurred())
PyErr_SetNone(PyExc_KeyboardInterrupt);
+ Py_DECREF(stdin_encoding);
return NULL;
}
if (*s == '\0') {
@@ -1353,9 +1364,13 @@
result = NULL;
}
else {
- result = PyUnicode_FromStringAndSize(s, len-1);
+ result = PyUnicode_Decode
+ (s, len-1,
+ PyUnicode_AsString(stdin_encoding),
+ NULL);
}
}
+ Py_DECREF(stdin_encoding);
PyMem_FREE(s);
return result;
}
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
