# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1484872553 21600
# Node ID e4f2d6a4b401b117292cdcd95a43b966a98df7cb
# Parent  8c901ab0df62a143620797ac3a8042cf58139f4f
Rework S3 connection logic for latest versions of Python 2.7.

Had to make these changes for Ubuntu 16.04. Seems backward compatible
with production.

diff -r 8c901ab0df62 -r e4f2d6a4b401 core/s3.py
--- a/core/s3.py	Mon Jan 16 13:23:46 2017 -0600
+++ b/core/s3.py	Thu Jan 19 18:35:53 2017 -0600
@@ -3,7 +3,8 @@
 This module provides Amazon S3 convenience wrappers.
 
 """
-from boto.s3.connection import S3Connection
+from boto.s3 import connect_to_region
+from boto.s3.connection import OrdinaryCallingFormat
 from boto.s3.key import Key
 
 
@@ -11,14 +12,24 @@
     """This class abstracts an Amazon S3 bucket.
 
     """
-    def __init__(self, access_key, secret_key, base_url, bucket_name):
-        self.conn = S3Connection(access_key, secret_key)
+    def __init__(self, access_key, secret_key, base_url, bucket_name,
+                 region_name='us-west-1'):
+        self.region_name = region_name
+        self.conn = self._get_connection(access_key, secret_key)
         self.bucket = self.conn.get_bucket(bucket_name, validate=False)
         self.base_url = base_url
         if not base_url.endswith('/'):
             self.base_url += '/'
         self.name = bucket_name
 
+    def _get_connection(self, access_key, secret_key):
+        conn = connect_to_region(
+                    self.region_name,
+                    aws_access_key_id=access_key,
+                    aws_secret_access_key=secret_key,
+                    calling_format=OrdinaryCallingFormat())
+        return conn
+
     def upload_from_file(self, key_name, fp, metadata=None, public=True):
         """Uploads data from the file object fp to a new key named
         key_name. metadata, if not None, must be a dict of metadata key / value