# HG changeset patch
# User paulb
# Date 1124453862 0
# Node ID 9f96d50218de1862213d06372b67acefc8b1ef70
# Parent  7ea5993f4bed9a585c1b181a7805a5938d2dfe14
[project @ 2005-08-19 12:17:42 by paulb]
Removed apparently needless session deadlocking.
Made the session file test more precise.

diff -r 7ea5993f4bed -r 9f96d50218de WebStack/Helpers/Session.py
--- a/WebStack/Helpers/Session.py	Fri Aug 19 12:17:24 2005 +0000
+++ b/WebStack/Helpers/Session.py	Fri Aug 19 12:17:42 2005 +0000
@@ -22,7 +22,6 @@
 
 import shelve
 import os
-import glob
 import time
 import random
 import sys
@@ -127,6 +126,11 @@
         created.
         """
 
+        if self.store is not None:
+            return self.store
+
+        # No existing store - get the token and the actual session.
+
         cookie = self.trans.get_cookie(self.session_cookie_name)
         if cookie:
             return self._get_session(cookie.value, create)
@@ -153,7 +157,7 @@
 
             # Where the session is present (possibly being edited)...
 
-            if glob.glob(filename + "*"):
+            if os.path.exists(filename) or os.path.exists(filename + ".edit"):
                 while 1:
                     try:
                         os.rename(filename, filename + ".edit")