mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-21 06:02:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Revert 55876. Use PyUnicode_AsEncodedString instead.

Browse source
This commit is contained in:
Martin v. Löwis 2007-06-12 05:53:00 +00:00
parent 543c09e700
commit 427dbff8f0
2 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Python/import.c
View file

@ -2305,10 +2305,10 @@ ensure_fromlist(PyObject *mod, PyObject *fromlist, char *buf, Py_ssize_t buflen,
if (!Py_FileSystemDefaultEncoding) {
item8 = PyUnicode_EncodeASCII(PyUnicode_AsUnicode(item),
PyUnicode_GetSize(item),
"strict");
NULL);
} else {
item8 = PyUnicode_AsEncodedObject(item,
Py_FileSystemDefaultEncoding, "strict");
item8 = PyUnicode_AsEncodedString(item,
Py_FileSystemDefaultEncoding, NULL);
}
if (!item8) {
PyErr_SetString(PyExc_ValueError, "Cannot encode path item");