diff options
author | Steve Dower <steve.dower@microsoft.com> | 2016-11-06 19:35:24 -0800 |
---|---|---|
committer | Steve Dower <steve.dower@microsoft.com> | 2016-11-06 19:35:24 -0800 |
commit | 1ded6486a7ec990985b89fd6819f6ad5a6897bed (patch) | |
tree | d527419ba01ad28d7e5969d61268db66f27f7424 /Objects/unicodeobject.c | |
parent | 2d7015bb768e4e7a373c5608d22a87882520dc63 (diff) | |
parent | 05074c5eba7ab5e023f3bc92528e18a8fecab2c4 (diff) | |
download | cpython-1ded6486a7ec990985b89fd6819f6ad5a6897bed.tar.gz |
Closes #27781: Removes special cases for the experimental aspect of PEP 529
Diffstat (limited to 'Objects/unicodeobject.c')
-rw-r--r-- | Objects/unicodeobject.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 6e63e009a9..e22eed8853 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -3832,18 +3832,9 @@ PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size) cannot only rely on it: check also interp->fscodec_initialized for subinterpreters. */ if (Py_FileSystemDefaultEncoding && interp->fscodec_initialized) { - PyObject *res = PyUnicode_Decode(s, size, + return PyUnicode_Decode(s, size, Py_FileSystemDefaultEncoding, Py_FileSystemDefaultEncodeErrors); -#ifdef MS_WINDOWS - if (!res && PyErr_ExceptionMatches(PyExc_UnicodeDecodeError)) { - _PyErr_FormatFromCause(PyExc_RuntimeError, - "filesystem path bytes were not correctly encoded with '%s'. " - "Please report this at http://bugs.python.org/issue27781", - Py_FileSystemDefaultEncoding); - } -#endif - return res; } else { return PyUnicode_DecodeLocaleAndSize(s, size, Py_FileSystemDefaultEncodeErrors); |