From 609ba81cdbd18c5af1220f242402dc4c7ac923a4 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Thu, 5 Sep 2002 21:08:25 +0000
Subject: [PATCH] SF # 555779, import user doesn't work with CGIs

---
 Lib/posixpath.py | 6 ++++--
 Lib/user.py      | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index 6c66689b6b..d5d2621c54 100644
--- 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 d0cb3ed3df..e550e52ad8 100644
--- 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:
-- 
2.40.0