Changeset 607 for python

Timestamp:

Dec 11, 2015, 7:20:33 PM (10 years ago)

Author:

dmik

Message:

python: Replace altsep to sep in paths returned by os.path.join.

This makes the returned paths consistent and fixes failures in situations
where the result is further passed to a unix shell (and similar cases).
See #148 for more details.

Location:

python/trunk/Lib

Files:

• os2emxpath.py (modified) (3 diffs)
• os2knixpath.py (modified) (3 diffs)

python/trunk/Lib/os2emxpath.py

@@ -37 +37 @@
 
     Makes all characters lowercase and all altseps into seps."""
-    return s.replace('\\', '/').lower()
+    return s.replace(altsep, sep).lower()
 
 
@@ -44 +44 @@
 def join(a, *p):
     """Join two or more pathname components, inserting sep as needed"""
+
+    Also replace all altsep chars with sep in the returned string
+    to make it consistent."""
     path = a
     for b in p:
@@ -52 +55 @@
         else:
             path = path + '/' + b
-    return path
+    return path.replace(altsep, sep)
 
 

python/trunk/Lib/os2knixpath.py

@@ -38 +38 @@
 
     Makes all characters lowercase and all altseps into seps."""
-    return s.replace('\\', '/').lower()
+    return s.replace(altsep, sep).lower()
 
 
@@ -44 +44 @@
 
 def join(a, *p):
-    """Join two or more pathname components, inserting sep as needed"""
+    """Join two or more pathname components, inserting sep as needed.
+
+    Also replaces all altsep chars with sep in the returned string
+    to make it consistent."""
     path = a
     for b in p:
@@ -53 +56 @@
         else:
             path = path + '/' + b
-    return path
+    return path.replace(altsep, sep)