Ticket #150: os2knixpath.py.diff

os2knixpath.py

@@ -19 +19 @@
            "splitunc","curdir","pardir","sep","pathsep","defpath","altsep",
            "extsep","devnull","realpath","supports_unicode_filenames"]
 
+_unixroot = os.environ.get('UNIXROOT')
+
 # strings representing various path-related bits and pieces
 curdir = '.'
 pardir = '..'
@@ -26 +28 @@
 sep = '/'
 altsep = '\\'
 pathsep = ';'
-defpath = '.;' + (os.environ['UNIXROOT'] + '\\usr\\bin' if 'UNIXROOT' in os.environ else 'C:\\bin')
+defpath = '.;' + (_unixroot.replace(sep, altsep) + '\\usr\\bin' if _unixroot else 'C:\\bin')
 devnull = 'nul'
 
+_unixroot_normcase = _unixroot.replace(altsep, sep).lower()
+
 # Normalize the case of a pathname and map slashes to backslashes.
 # Other normalizations (such as optimizing '../' away) are not done
 # (this is done by normpath).
@@ -36 +40 @@
 def normcase(s):
     """Normalize case of pathname.
 
-    Makes all characters lowercase and all altseps into seps."""
-    return s.replace(altsep, sep).lower()
+    Makes all characters lowercase and all altseps into seps.
 
+    Also, if the string starts with os.environ['UNIXROOT'], this part
+    will be replaced with '/@unixroot' to ensure portability of the
+    returned path across different installations."""
+    s = s.replace(altsep, sep).lower()
+    if _unixroot:
+        s = s.replace(_unixroot_normcase, '/@unixroot')
+    return s
 
 # Join two (or more) paths.