--- client.py.orig	2004-08-03 14:01:12.000000000 -0700
+++ client.py	2004-08-03 14:02:09.000000000 -0700
@@ -284,14 +284,13 @@
         self.clean_sessions()
         sessions = self.db.getSessionManager()
 
-        user = 'anonymous'
 
         # first up, try the REMOTE_USER var (from HTTP Basic Auth handled
         # by a front-end HTTP server)
-        try:
-            user = os.getenv('REMOTE_USER')
-        except KeyError:
-            pass
+        if self.env.has_key('REMOTE_USER'):
+            user = self.env.get('REMOTE_USER')
+        else:
+            user = 'anonymous'
 
         # look up the user session cookie (may override the REMOTE_USER)
         cookie = Cookie.SimpleCookie(self.env.get('HTTP_COOKIE', ''))