diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-03-31 13:40:14 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-03-31 13:40:14 +0200 |
| commit | f0d95770c8691097630ba5cb8ddbeef4e9037a27 (patch) | |
| tree | 088a58e90fb3e23369e491122b8111a9a96256cd /Python/sysmodule.c | |
| parent | db0247438274947943c0df445589863f49e7b128 (diff) | |
| parent | 6b836616e2e69184bce1d534b9b00204779f580d (diff) | |
| download | cpython-f0d95770c8691097630ba5cb8ddbeef4e9037a27.tar.gz | |
Merge 3.2: sys.getfilesystemencoding() raises a RuntimeError if
initfsencoding() was not called yet: detect bootstrap (startup) issues earlier.
Diffstat (limited to 'Python/sysmodule.c')
| -rw-r--r-- | Python/sysmodule.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 33255ad72e..fdf361fa8b 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -259,8 +259,9 @@ sys_getfilesystemencoding(PyObject *self) { if (Py_FileSystemDefaultEncoding) return PyUnicode_FromString(Py_FileSystemDefaultEncoding); - Py_INCREF(Py_None); - return Py_None; + PyErr_SetString(PyExc_RuntimeError, + "filesystem encoding is not initialized"); + return NULL; } PyDoc_STRVAR(getfilesystemencoding_doc, |