Ticket #6082: 6082.diff

contrib/sessions/backends/file.py

@@ -1 +1 @@
 import os
 from django.conf import settings
 from django.contrib.sessions.backends.base import SessionBase
-from django.core.exceptions import SuspiciousOperation
+from django.core.exceptions import SuspiciousOperation, ImproperlyConfigured
 
 class SessionStore(SessionBase):
     """
@@ -9 +9 @@
     """
     def __init__(self, session_key=None):
         self.storage_path = settings.SESSION_FILE_PATH
+        
+        if not os.path.isdir(self.storage_path):
+            try:
+                if os.path.isdir(os.environ['TMPDIR']):            
+                    self.storage_path = os.environ['TMPDIR']
+            except:
+                #fail silently
+                pass 
+            try:
+                if os.path.isdir(os.environ['TEMP']):            
+                    self.storage_path = os.environ['TEMP']
+            except:
+                #fail silently
+                pass
+        
+        # If we still don't have a storage path we should error out here
+        # more than likely this will not happen
+        if not os.path.isdir(self.storage_path):
+            raise \
+                ImproperlyConfigured("Storage path: %s is not a valid directory" % self.storage_path)
+        
         self.file_prefix = settings.SESSION_COOKIE_NAME    
         super(SessionStore, self).__init__(session_key)