Subtlety: ~root/a should expand to /a, not //a. Everything else unchanged.

diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index c288f3b5b39f7b427467c177b9a5bf97efa713eb..d284834488624d03972673d6c3cd624e4fec2a37 100644 (file)
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -241,6 +241,7 @@ def expanduser(path):
                except KeyError:
                        return path
                userhome = pwent[5]
+       if userhome[-1:] == '/': i = i+1
        return userhome + path[i:]