diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-10-25 04:06:15 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-10-25 04:06:15 (GMT) |
| commit | c801ad36ee9730e7a066ffb2ee2636684527d24b (patch) | |
| tree | ac22e3fc8dce8253e903f05236ddba4c88842129 /Python | |
| parent | 3ed559a3c7530fa6d580a7f204d162a448cbb948 (diff) | |
| parent | b528fcf9540dc2db5217e3388e9fc81dce08b70f (diff) | |
| download | cpython-c801ad36ee9730e7a066ffb2ee2636684527d24b.zip cpython-c801ad36ee9730e7a066ffb2ee2636684527d24b.tar.gz cpython-c801ad36ee9730e7a066ffb2ee2636684527d24b.tar.bz2 | |
merge heads
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/import.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Python/import.c b/Python/import.c index e21ae39..3842c63 100644 --- a/Python/import.c +++ b/Python/import.c @@ -938,12 +938,19 @@ make_compiled_pathname(PyObject *pathstr, int debug) 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 @@ make_compiled_pathname(PyObject *pathstr, int debug) 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; |