Mercurial > cpython-lru_cache-weakref
diff Python/sysmodule.c @ 42099:6727cc9ed09f
Make sys.path and sys.argv into lists of strings.
Remove the hack in test_popen.py to overcome this issue.
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Fri, 15 Jun 2007 03:49:03 +0000 |
| parents | 825041fc8e2c |
| children | 4d2aa4bfb2d6 |
line wrap: on
line diff
--- a/Python/sysmodule.c Fri Jun 15 03:35:38 2007 +0000 +++ b/Python/sysmodule.c Fri Jun 15 03:49:03 2007 +0000 @@ -1145,7 +1145,7 @@ p = strchr(path, delim); if (p == NULL) p = strchr(path, '\0'); /* End of string */ - w = PyString_FromStringAndSize(path, (Py_ssize_t) (p - path)); + w = PyUnicode_FromStringAndSize(path, (Py_ssize_t) (p - path)); if (w == NULL) { Py_DECREF(v); return NULL; @@ -1190,14 +1190,14 @@ if (i == 0) { char* fn = decc$translate_vms(argv[0]); if ((fn == (char *)0) || fn == (char *)-1) - v = PyString_FromString(argv[0]); + v = PyUnicode_FromString(argv[0]); else - v = PyString_FromString( + v = PyUnicode_FromString( decc$translate_vms(argv[0])); } else - v = PyString_FromString(argv[i]); + v = PyUnicode_FromString(argv[i]); #else - PyObject *v = PyString_FromString(argv[i]); + PyObject *v = PyUnicode_FromString(argv[i]); #endif if (v == NULL) { Py_DECREF(av); @@ -1301,7 +1301,7 @@ #endif /* Unix */ } #endif /* All others */ - a = PyString_FromStringAndSize(argv0, n); + a = PyUnicode_FromStringAndSize(argv0, n); if (a == NULL) Py_FatalError("no mem for sys.path insertion"); if (PyList_Insert(path, 0, a) < 0)