mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-18 14:40:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix test_imp failure under Windows

Browse source
This commit is contained in:
Antoine Pitrou 2011-10-25 00:21:02 +02:00
parent 08a95cabe3
commit b528fcf954
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Python/import.c
View file

@ -938,12 +938,19 @@ make_compiled_pathname(PyObject *pathstr, int debug)
Py_ssize_t pycache_len = sizeof(CACHEDIR) - 1; Py_ssize_t pycache_len = sizeof(CACHEDIR) - 1;
int kind; int kind;
void *data; void *data;
Py_UCS4 lastsep;
/* Compute the output string size. */ /* Compute the output string size. */
len = PyUnicode_GET_LENGTH(pathstr); len = PyUnicode_GET_LENGTH(pathstr);
/* If there is no separator, this returns -1, so /* If there is no separator, this returns -1, so
lastsep will be 0. */ fname will be 0. */
fname = rightmost_sep_obj(pathstr, 0, len) + 1; fname = rightmost_sep_obj(pathstr, 0, len) + 1;
/* Windows: re-use the last separator character (/ or \\) when
appending the __pycache__ path. */
if (fname > 0)
lastsep = PyUnicode_READ_CHAR(pathstr, fname -1);
else
lastsep = SEP;
ext = fname - 1; ext = fname - 1;
for(i = fname; i < len; i++) for(i = fname; i < len; i++)
if (PyUnicode_READ_CHAR(pathstr, i) == '.') if (PyUnicode_READ_CHAR(pathstr, i) == '.')
@ -965,7 +972,7 @@ make_compiled_pathname(PyObject *pathstr, int debug)
pos = fname; pos = fname;
for (i = 0; i < pycache_len; i++) for (i = 0; i < pycache_len; i++)
PyUnicode_WRITE(kind, data, pos++, CACHEDIR[i]); PyUnicode_WRITE(kind, data, pos++, CACHEDIR[i]);
PyUnicode_WRITE(kind, data, pos++, SEP); PyUnicode_WRITE(kind, data, pos++, lastsep);
PyUnicode_CopyCharacters(result, pos, pathstr, PyUnicode_CopyCharacters(result, pos, pathstr,
fname, ext - fname); fname, ext - fname);
pos += ext - fname; pos += ext - fname;