Added support for a different AWS region.

Rense VanderHoek · Rense VanderHoek · commit 0efddd100fa0 · 2013-03-01T15:28:37.000+01:00
diff --git a/README.rst b/README.rst
@@ -92,6 +92,7 @@ The following settings may be used in your ``settings.py``:
                                       to use for DynamoDB.
 :DYNAMODB_SESSIONS_AWS_SECRET_ACCESS_KEY: The secret for the AWS account
                                           to use for DynamoDB.
+:DYNAMODB_SESSIONS_AWS_REGION_NAME: The region to use for DynamoDB.
 
 Changes
 -------
diff --git a/dynamodb_sessions/backends/dynamodb.py b/dynamodb_sessions/backends/dynamodb.py
@@ -27,11 +27,16 @@
 if not AWS_SECRET_ACCESS_KEY:
     AWS_SECRET_ACCESS_KEY = getattr(settings, 'AWS_SECRET_ACCESS_KEY')
 
+AWS_REGION_NAME = getattr(settings, 'DYNAMODB_SESSIONS_AWS_REGION_NAME', False)
+if not AWS_REGION_NAME:
+    AWS_REGION_NAME = getattr(settings, 'AWS_REGION_NAME', 'us-east-1')
+
 # We'll find some better way to do this.
 _DYNAMODB_CONN = None
 
 logger = logging.getLogger(__name__)
 
+
 def dynamodb_connection_factory():
     """
     Since SessionStore is called for every single page view, we'd be
@@ -45,10 +50,12 @@ def dynamodb_connection_factory():
         logger.debug("Creating a DynamoDB connection.")
         _DYNAMODB_CONN = boto.connect_dynamodb(
             aws_access_key_id=AWS_ACCESS_KEY_ID,
-            aws_secret_access_key=AWS_SECRET_ACCESS_KEY
+            aws_secret_access_key=AWS_SECRET_ACCESS_KEY,
+            region=AWS_REGION_NAME
         )
     return _DYNAMODB_CONN
 
+
 class SessionStore(SessionBase):
     """
     Implements DynamoDB session store.
@@ -66,7 +73,7 @@ def load(self):
         :rtype: dict
         :returns: The de-coded session data, as a dict.
         """
-        
+
         try:
             item = self.table.get_item(self.session_key,
                                        consistent_read=ALWAYS_CONSISTENT)
@@ -120,30 +127,30 @@ def save(self, must_create=False):
         :raises: ``CreateError`` if ``must_create`` is ``True`` and a session
             with the current session key already exists.
         """
-        # 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 
+        # 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:
             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:
             # 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``.
