Merge pull request #3254 from HarryRybacki/add_EUCentral1_to_s3

Add EUCentral1 (Frankfurt) to S3 Location

boto/s3/connection.py

@@ -138,7 +138,8 @@ def build_url_base(self, connection, protocol, server, bucket, key=''):
 class Location(object):
 
     DEFAULT = ''  # US Classic Region
-    EU = 'EU'
+    EU = 'EU'  # Ireland
+    EUCentral1 = 'eu-central-1'  # Frankfurt
     USWest = 'us-west-1'
     USWest2 = 'us-west-2'
     SAEast = 'sa-east-1'

docs/source/s3_tut.rst

@@ -81,6 +81,7 @@ boto.s3.connection module, like this::
     APSoutheast2
     DEFAULT
     EU
+    EUCentral1
     SAEast
     USWest
     USWest2

tests/integration/s3/test_connect_to_region.py

@@ -57,6 +57,11 @@ def testSuccessWithDefaultUSEast1(self):
         self.assertEquals('s3.amazonaws.com', connection.host)
         self.assertIsInstance(connection, S3Connection)
 
+    def testSuccessWithDefaultEUCentral1(self):
+        connection = connect_to_region('eu-central-1')
+        self.assertEquals('s3.eu-central-1.amazonaws.com', connection.host)
+        self.assertIsInstance(connection, S3Connection)
+
     def testDefaultWithInvalidHost(self):
         connect_args = dict({'host':''})
         connection = connect_to_region('us-west-2', **connect_args)

tests/unit/s3/test_bucket.py

@@ -6,7 +6,7 @@
 from tests.unit import AWSMockServiceTestCase
 
 from boto.exception import BotoClientError
-from boto.s3.connection import S3Connection
+from boto.s3.connection import Location, S3Connection
 from boto.s3.bucket import Bucket
 from boto.s3.deletemarker import DeleteMarker
 from boto.s3.key import Key
@@ -25,6 +25,14 @@ def test_bucket_create_bucket(self):
         bucket = self.service_connection.create_bucket('mybucket_create')
         self.assertEqual(bucket.name, 'mybucket_create')
 
+    def test_bucket_create_eu_central_1_location(self):
+        self.set_http_response(status_code=200)
+        bucket = self.service_connection.create_bucket(
+            'eu_central_1_bucket',
+            location=Location.EUCentral1
+        )
+        self.assertEqual(bucket.name, 'eu_central_1_bucket')
+
     def test_bucket_constructor(self):
         self.set_http_response(status_code=200)
         bucket = Bucket(self.service_connection, 'mybucket_constructor')