Merge pull request #6 from bjinwright/master

Greg Taylor · Greg Taylor · commit 9702897d6654 · 2013-02-14T10:09:34.000-08:00
Fix for the TypeError: Unsupported type "" for value "None" erros
diff --git a/.gitignore b/.gitignore
@@ -2,9 +2,13 @@
 *.swp
 *.tmp
 *~
+*.pydevproject
+*.project
 .idea
 MANIFEST
 build
 dist
 boto
+testapp/
+manage.py
 *.egg-info
diff --git a/dynamodb_sessions/backends/dynamodb.py b/dynamodb_sessions/backends/dynamodb.py
@@ -4,7 +4,8 @@
 import boto
 from django.conf import settings
 from django.contrib.sessions.backends.base import SessionBase, CreateError
-from django.utils.hashcompat import md5_constructor
+from django.core.exceptions import SuspiciousOperation
+
 from boto.dynamodb.exceptions import DynamoDBKeyNotFoundError
 from boto.exception import DynamoDBResponseError
 
@@ -65,11 +66,11 @@ def load(self):
         :rtype: dict
         :returns: The de-coded session data, as a dict.
         """
-        logger.debug("Loading session data for: %s" % self.session_key)
+        
         try:
             item = self.table.get_item(self.session_key,
                                        consistent_read=ALWAYS_CONSISTENT)
-        except DynamoDBKeyNotFoundError:
+        except (DynamoDBKeyNotFoundError,SuspiciousOperation):
             self.create()
             return {}
 
@@ -84,32 +85,26 @@ def exists(self, session_key):
         :returns: ``True`` if a session with the given key exists in the DB,
             ``False`` if not.
         """
-        logger.debug("Session key exists?: %s" % session_key)
         key_already_exists = self.table.has_item(
             session_key,
             consistent_read=ALWAYS_CONSISTENT,
         )
         if key_already_exists:
-            logger.debug("  - Yes, key exists.")
             return True
         else:
-            logger.debug("  - No, key doesn't exist.")
             return False
 
     def create(self):
         """
         Creates a new entry in DynamoDB. This may or may not actually
         have anything in it.
         """
-        logger.debug("Creating a new session")
         while True:
             try:
                 # Save immediately to ensure we have a unique entry in the
                 # database.
                 self.save(must_create=True)
             except CreateError:
-                # Key wasn't unique. Try again.
-                logger.debug("  - Key wasn't unique, trying again...")
                 continue
             self.modified = True
             self._session_cache = {}
@@ -125,40 +120,30 @@ def save(self, must_create=False):
         :raises: ``CreateError`` if ``must_create`` is ``True`` and a session
             with the current session key already exists.
         """
-        # This base64 encodes session data.
-        data = self.encode(self._get_session(no_load=must_create))
-
+        # If the save method is called with must_create equal to True, I'm 
+        # setting self._session_key equal to None and when 
+        # self.get_or_create_session_key is called the new 
+        # session_key will be created.
         if must_create:
-            # Force the generation of a new session key.
-            self._session_key = self._get_new_session_key()
-            logger.debug("  - Saving new session: %s" % self.session_key)
-            item = self.table.new_item(
-                self.session_key,
-                # Stuff the base64 encoded stuff into the 'data' attrib.
-                attrs={
-                    'data': data,
-                    # This will be used for session expiration.
-                    'created': int(time.time()),
-                }
-            )
-            try:
-                # We expect the 'data' attribute to not exist.
-                item.put(expected_value={'data': False})
-            except DynamoDBResponseError:
-                # There's already an item with this key.
-                raise CreateError
+            self._session_key = None
+        
+        self._get_or_create_session_key()
+        item = self.table.new_item(self.session_key)
+        # Queue up a PUT operation for UpdateItem, which preserves the
+        # existing 'created' attribute.
+        item.put_attribute('data',self.encode(self._get_session(no_load=must_create)))
+        
+        if must_create:
+            
+            item.put_attribute('created',int(time.time()))
+            # We expect the data value to be False because we are creating a
+            # new session
+            item.put(expected_value={'data': False})
         else:
-            logger.debug("Saving existing session: %s" % self.session_key)
-            # This isn't really creating a new item, just a container for
-            # us to use put_attribute to queue an attrib update to.
-            item = self.table.new_item(self.session_key)
-            # Queue up a PUT operation for UpdateItem, which preserves the
-            # existing 'created' attribute.
-            item.put_attribute('data', data)
             # Commits the PUT UpdateItem for the 'data' attrib, meanwhile
-            # leaving the 'created' attrib un-touched.
+            # leaving the 'created' attrib un-touched.                   
             item.save()
-
+        
     def delete(self, session_key=None):
         """
         Deletes the current session, or the one specified in ``session_key``.
@@ -171,7 +156,6 @@ def delete(self, session_key=None):
                 return
             session_key = self.session_key
 
-        logger.debug("Deleting session: %s" % session_key)
         key = self.table.layer2.build_key_from_values(
             self.table.schema,
             session_key,
diff --git a/dynamodb_sessions/models.py b/dynamodb_sessions/models.py
@@ -0,0 +1,5 @@
+'''
+Created on Feb 13, 2013
+
+@author: brian
+'''
diff --git a/dynamodb_sessions/tests.py b/dynamodb_sessions/tests.py
@@ -0,0 +1,19 @@
+'''
+Created on Feb 13, 2013
+
+@author: brian
+'''
+from django.contrib.sessions.tests import SessionTestsMixin,DatabaseSessionTests
+from django.test import TestCase
+
+from .backends.dynamodb import SessionStore as DynamoDBSession
+from .backends.cached_dynamodb import SessionStore as CachedDynamoDBSession
+
+class DynamoDBTestCase(SessionTestsMixin,TestCase):
+    
+    backend = DynamoDBSession
+    
+class CachedDynamoDBTestCase(SessionTestsMixin,TestCase):
+    
+    backend = CachedDynamoDBSession
+    

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +'''
 +Created on Feb 13, 2013
++
 +@author: brian
 +'''