[Python-checkins] cpython: Fix test_imp failure under Windows
antoine.pitrou
python-checkins at python.org
Tue Oct 25 00:26:38 CEST 2011
http://hg.python.org/cpython/rev/63ffa07f9258
changeset: 73110:63ffa07f9258
parent: 73105:2358a46b621e
user: Antoine Pitrou <solipsis at pitrou.net>
date: Tue Oct 25 00:21:02 2011 +0200
summary:
Fix test_imp failure under Windows
files:
Python/import.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Python/import.c b/Python/import.c
--- a/Python/import.c
+++ b/Python/import.c
@@ -938,12 +938,19 @@
Py_ssize_t pycache_len = sizeof(CACHEDIR) - 1;
int kind;
void *data;
+ Py_UCS4 lastsep;
/* Compute the output string size. */
len = PyUnicode_GET_LENGTH(pathstr);
/* 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;
+ /* 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;
for(i = fname; i < len; i++)
if (PyUnicode_READ_CHAR(pathstr, i) == '.')
@@ -965,7 +972,7 @@
pos = fname;
for (i = 0; i < pycache_len; 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,
fname, ext - fname);
pos += ext - fname;
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list