From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 24 Oct 2011 22:21:02 +0000 (+0200)
Subject: Fix test_imp failure under Windows
X-Git-Tag: v3.3.0a1~1071^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b528fcf9540dc2db5217e3388e9fc81dce08b70f;p=thirdparty%2FPython%2Fcpython.git

Fix test_imp failure under Windows
---

diff --git a/Python/import.c b/Python/import.c
index e21ae39359b8..3842c63c2e84 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;