mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-27 20:25:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.5 (#25630)

Browse source
This commit is contained in:
Benjamin Peterson 2015-11-15 21:57:50 -08:00
commit d798dc1034
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Objects/unicodeobject.c
View file

@ -3775,6 +3775,7 @@ PyUnicode_FSConverter(PyObject* arg, void* addr)
void *data;
if (arg == NULL) {
Py_DECREF(*(PyObject**)addr);
*(PyObject**)addr = NULL;
return 1;
}
if (PyBytes_Check(arg)) {