SF # 555779, import user doesn't work with CGIs

diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index 6c66689b6b1d96eba9f853f76bccdef6c466c0c7..d5d2621c54d0dc84f3f93946d70ce31d5aa67e80 100644 (file)
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -303,8 +303,10 @@ def expanduser(path):
         i = i + 1
     if i == 1:
         if not 'HOME' in os.environ:
-            return path
-        userhome = os.environ['HOME']
+            import pwd
+            userhome = pwd.getpwuid(os.getuid())[5]
+        else:
+            userhome = os.environ['HOME']
     else:
         import pwd
         try:

diff --git a/Lib/user.py b/Lib/user.py
index d0cb3ed3df20a81d67f1b403678688d4b939f019..e550e52ad807a413c9cef994da690635c19052c6 100644 (file)
--- a/Lib/user.py
+++ b/Lib/user.py
@@ -26,6 +26,8 @@ import os
 home = os.curdir                        # Default
 if 'HOME' in os.environ:
     home = os.environ['HOME']
+elif os.name == 'posix':
+    home = os.path.expanduser("~/")
 elif os.name == 'nt':                   # Contributed by Jeff Bauer
     if 'HOMEPATH' in os.environ:
         if 'HOMEDRIVE' in os.environ: