mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 11:23:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

os.environ contains PyUnicode instances and not PyString instances

Browse source
This commit is contained in:
Christian Heimes 2007-11-22 07:43:40 +00:00
parent b2b6262831
commit 830a4bcfd4
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Modules/posixmodule.c
View file

@ -3026,7 +3026,7 @@ posix_execve(PyObject *self, PyObject *args)
/* Omit Pseudo-Env Vars that Would Confuse Programs if Passed On */ /* Omit Pseudo-Env Vars that Would Confuse Programs if Passed On */
if (stricmp(k, "BEGINLIBPATH") != 0 && stricmp(k, "ENDLIBPATH") != 0) { if (stricmp(k, "BEGINLIBPATH") != 0 && stricmp(k, "ENDLIBPATH") != 0) {
#endif #endif
len = PyString_Size(key) + PyString_Size(val) + 2; len = PyUnicode_GetSize(key) + PyUnicode_GetSize(val) + 2;
p = PyMem_NEW(char, len); p = PyMem_NEW(char, len);
if (p == NULL) { if (p == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
@ -3256,7 +3256,7 @@ posix_spawnve(PyObject *self, PyObject *args)
{ {
goto fail_2; goto fail_2;
} }
len = PyString_Size(key) + PyString_Size(val) + 2; len = PyUnicode_GetSize(key) + PyUnicode_GetSize(val) + 2;
p = PyMem_NEW(char, len); p = PyMem_NEW(char, len);
if (p == NULL) { if (p == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
@ -3489,7 +3489,7 @@ posix_spawnvpe(PyObject *self, PyObject *args)
{ {
goto fail_2; goto fail_2;
} }
len = PyString_Size(key) + PyString_Size(val) + 2; len = PyUnicode_GetSize(key) + PyUnicode_GetSize(val) + 2;
p = PyMem_NEW(char, len); p = PyMem_NEW(char, len);
if (p == NULL) { if (p == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();