]> granicus.if.org Git - python/commitdiff
os.environ contains PyUnicode instances and not PyString instances
authorChristian Heimes <christian@cheimes.de>
Thu, 22 Nov 2007 07:43:40 +0000 (07:43 +0000)
committerChristian Heimes <christian@cheimes.de>
Thu, 22 Nov 2007 07:43:40 +0000 (07:43 +0000)
Modules/posixmodule.c

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