1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sys.path and sys.argv into lists of strings.

Browse Source 
Remove the hack in test_popen.py to overcome this issue.
This commit is contained in:
Guido van Rossum 2007-06-15 03:49:03 +00:00
parent aa588c4699
commit 96ca6916b4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_popen.py
View File

@ -20,7 +20,7 @@ if ' ' in python:
class PopenTest(unittest.TestCase): class PopenTest(unittest.TestCase):
def _do_test_commandline(self, cmdline, expected): def _do_test_commandline(self, cmdline, expected):
cmd = '%s -c "import sys; print(list(map(str, sys.argv)))" %s' cmd = '%s -c "import sys; print(sys.argv)" %s'
cmd = cmd % (python, cmdline) cmd = cmd % (python, cmdline)
data = os.popen(cmd).read() data = os.popen(cmd).read()
got = eval(data)[1:] # strip off argv[0] got = eval(data)[1:] # strip off argv[0]

12
Python/sysmodule.c
View File

@ -1145,7 +1145,7 @@ makepathobject(char *path, int delim)
p = strchr(path, delim); p = strchr(path, delim);
if (p == NULL) if (p == NULL)
p = strchr(path, '\0'); /* End of string */ 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) { if (w == NULL) {
Py_DECREF(v); Py_DECREF(v);
return NULL; return NULL;
@ -1190,14 +1190,14 @@ makeargvobject(int argc, char **argv)
if (i == 0) { if (i == 0) {
char* fn = decc$translate_vms(argv[0]); char* fn = decc$translate_vms(argv[0]);
if ((fn == (char *)0) || fn == (char *)-1) if ((fn == (char *)0) || fn == (char *)-1)
v = PyString_FromString(argv[0]); v = PyUnicode_FromString(argv[0]);
else else
v = PyString_FromString( v = PyUnicode_FromString(
decc$translate_vms(argv[0])); decc$translate_vms(argv[0]));
} else } else
v = PyString_FromString(argv[i]); v = PyUnicode_FromString(argv[i]);
#else #else
PyObject *v = PyString_FromString(argv[i]); PyObject *v = PyUnicode_FromString(argv[i]);
#endif #endif
if (v == NULL) { if (v == NULL) {
Py_DECREF(av); Py_DECREF(av);
@ -1301,7 +1301,7 @@ PySys_SetArgv(int argc, char **argv)
#endif /* Unix */ #endif /* Unix */
} }
#endif /* All others */ #endif /* All others */
a = PyString_FromStringAndSize(argv0, n); a = PyUnicode_FromStringAndSize(argv0, n);
if (a == NULL) if (a == NULL)
Py_FatalError("no mem for sys.path insertion"); Py_FatalError("no mem for sys.path insertion");
if (PyList_Insert(path, 0, a) < 0) if (PyList_Insert(path, 0, a) < 0)