Allow overriding provider in connection objects

1 files changed, 8 insertions, 4 deletions

diff --git a/boto/connection.py b/boto/connection.py
index e170d0b3..11382bb5 100644
--- a/boto/connection.py
+++ b/boto/connection.py
@@ -470,10 +470,14 @@ class AWSAuthConnection(object):
                 timeout = config.getint('Boto', 'http_socket_timeout')
                 self.http_connection_kwargs['timeout'] = timeout
 
-        self.provider = Provider(provider,
-                                 aws_access_key_id,
-                                 aws_secret_access_key,
-                                 security_token)
+        if isinstance(provider, Provider):
+            # Allow overriding Provider
+            self.provider = provider
+        else:
+            self.provider = Provider(provider,
+                                     aws_access_key_id,
+                                     aws_secret_access_key,
+                                     security_token)
 
         # allow config file to override default host
         if self.provider.host: