summaryrefslogtreecommitdiff
path: root/boto/iam
diff options
context:
space:
mode:
authorDaniel Lindsley <daniel@toastdriven.com>2013-12-23 13:48:38 -0800
committerDaniel Lindsley <daniel@toastdriven.com>2013-12-23 13:48:38 -0800
commit3c49e87c2729e532ba5714119bc7de06c6152371 (patch)
tree06cb1e8e5bb895c4b62035a31f90bcc1c4636a6c /boto/iam
parent237f9a0fc9fa58aea7cdb782ed56b220c2d964d6 (diff)
parent607624ff0b7cfde5dea4d107cc0b44fecef6ce04 (diff)
downloadboto-3c49e87c2729e532ba5714119bc7de06c6152371.tar.gz
Merge branch 'switch-to-super' into develop
Fixes #1918, #1936 & #1937.
Diffstat (limited to 'boto/iam')
-rw-r--r--boto/iam/connection.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/boto/iam/connection.py b/boto/iam/connection.py
index 7176ceda..32b3ab2e 100644
--- a/boto/iam/connection.py
+++ b/boto/iam/connection.py
@@ -42,7 +42,7 @@ class IAMConnection(AWSQueryConnection):
proxy_user=None, proxy_pass=None, host='iam.amazonaws.com',
debug=0, https_connection_factory=None,
path='/', security_token=None, validate_certs=True):
- AWSQueryConnection.__init__(self, aws_access_key_id,
+ super(IAMConnection, self).__init__(aws_access_key_id,
aws_secret_access_key,
is_secure, port, proxy,
proxy_port, proxy_user, proxy_pass,
@@ -51,7 +51,6 @@ class IAMConnection(AWSQueryConnection):
validate_certs=validate_certs)
def _required_auth_capability(self):
- #return ['iam']
return ['hmac-v4']
def get_response(self, action, params, path='/', parent=None,