diff options
author | Felix Yan <felixonmars@gmail.com> | 2014-08-27 15:27:18 +0800 |
---|---|---|
committer | Felix Yan <felixonmars@gmail.com> | 2014-08-27 15:27:18 +0800 |
commit | d52c6a47cf058d47ab30e272571848747118eb61 (patch) | |
tree | 2ab3e8ca264654fb020911e5199d7191b3e88491 | |
parent | ac2b311c04cb49b337ba033b1a550039c12c929d (diff) | |
download | boto-d52c6a47cf058d47ab30e272571848747118eb61.tar.gz |
iam module: tidy up to meet PEP8 better
-rw-r--r-- | boto/iam/connection.py | 26 | ||||
-rw-r--r-- | boto/iam/summarymap.py | 2 | ||||
-rw-r--r-- | tests/integration/iam/test_connection.py | 1 | ||||
-rw-r--r-- | tests/unit/iam/test_connection.py | 47 |
4 files changed, 38 insertions, 38 deletions
diff --git a/boto/iam/connection.py b/boto/iam/connection.py index d870079b..3a115302 100644 --- a/boto/iam/connection.py +++ b/boto/iam/connection.py @@ -64,13 +64,13 @@ class IAMConnection(AWSQueryConnection): debug=0, https_connection_factory=None, path='/', security_token=None, validate_certs=True, profile_name=None): super(IAMConnection, self).__init__(aws_access_key_id, - aws_secret_access_key, - is_secure, port, proxy, - proxy_port, proxy_user, proxy_pass, - host, debug, https_connection_factory, - path, security_token, - validate_certs=validate_certs, - profile_name=profile_name) + aws_secret_access_key, + is_secure, port, proxy, + proxy_port, proxy_user, proxy_pass, + host, debug, https_connection_factory, + path, security_token, + validate_certs=validate_certs, + profile_name=profile_name) def _required_auth_capability(self): return ['hmac-v4'] @@ -700,7 +700,7 @@ class IAMConnection(AWSQueryConnection): # def list_server_certs(self, path_prefix='/', - marker=None, max_items=None): + marker=None, max_items=None): """ Lists the server certificates that have the specified path prefix. If none exist, the action returns an empty list. @@ -1199,8 +1199,8 @@ class IAMConnection(AWSQueryConnection): :param instance_profile_name: Name of the instance profile to get information about. """ - return self.get_response('GetInstanceProfile', {'InstanceProfileName': - instance_profile_name}) + return self.get_response('GetInstanceProfile', + {'InstanceProfileName': instance_profile_name}) def get_role(self, role_name): """ @@ -1453,7 +1453,7 @@ class IAMConnection(AWSQueryConnection): provider to get information about. """ - params = {'SAMLProviderArn': saml_provider_arn } + params = {'SAMLProviderArn': saml_provider_arn} return self.get_response('GetSAMLProvider', params) def update_saml_provider(self, saml_provider_arn, saml_metadata_document): @@ -1496,7 +1496,7 @@ class IAMConnection(AWSQueryConnection): provider to delete. """ - params = {'SAMLProviderArn': saml_provider_arn } + params = {'SAMLProviderArn': saml_provider_arn} return self.get_response('DeleteSAMLProvider', params) # @@ -1517,7 +1517,7 @@ class IAMConnection(AWSQueryConnection): def get_credential_report(self): """ Retrieves a credential report for an account - + A report must have been generated in the last 4 hours to succeed. The report is returned as a base64 encoded blob within the response. """ diff --git a/boto/iam/summarymap.py b/boto/iam/summarymap.py index 00023895..b7976bb7 100644 --- a/boto/iam/summarymap.py +++ b/boto/iam/summarymap.py @@ -20,6 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. + class SummaryMap(dict): def __init__(self, parent=None): @@ -39,4 +40,3 @@ class SummaryMap(dict): self[self._name] = value else: setattr(self, name, value) - diff --git a/tests/integration/iam/test_connection.py b/tests/integration/iam/test_connection.py index 73837a67..61953f17 100644 --- a/tests/integration/iam/test_connection.py +++ b/tests/integration/iam/test_connection.py @@ -25,6 +25,7 @@ import time from tests.compat import unittest + class TestIAM(unittest.TestCase): def test_group_users(self): # A very basic test to create a group, a user, add the user diff --git a/tests/unit/iam/test_connection.py b/tests/unit/iam/test_connection.py index bcf3c727..32df55f6 100644 --- a/tests/unit/iam/test_connection.py +++ b/tests/unit/iam/test_connection.py @@ -22,7 +22,6 @@ # from base64 import b64decode -from tests.unit import unittest from boto.compat import json from boto.iam.connection import IAMConnection from tests.unit import AWSMockServiceTestCase @@ -53,8 +52,8 @@ class TestCreateSamlProvider(AWSMockServiceTestCase): 'Name': 'name'}, ignore_params_values=['Version']) - self.assertEqual(response['create_saml_provider_response']\ - ['create_saml_provider_result']\ + self.assertEqual(response['create_saml_provider_response'] + ['create_saml_provider_result'] ['saml_provider_arn'], 'arn') @@ -92,12 +91,12 @@ class TestListSamlProviders(AWSMockServiceTestCase): {'Action': 'ListSAMLProviders'}, ignore_params_values=['Version']) self.assertEqual(response.saml_provider_list, [ - {'arn':'arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Database', - 'valid_until':'2032-05-09T16:27:11Z', - 'create_date':'2012-05-09T16:27:03Z'}, - {'arn':'arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Webserver', - 'valid_until':'2015-03-11T13:11:02Z', - 'create_date':'2012-05-09T16:27:11Z'}]) + {'arn': 'arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Database', + 'valid_until': '2032-05-09T16:27:11Z', + 'create_date': '2012-05-09T16:27:03Z'}, + {'arn': 'arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Webserver', + 'valid_until': '2015-03-11T13:11:02Z', + 'create_date': '2012-05-09T16:27:11Z'}]) class TestGetSamlProvider(AWSMockServiceTestCase): @@ -119,7 +118,7 @@ class TestGetSamlProvider(AWSMockServiceTestCase): def test_get_saml_provider(self): self.set_http_response(status_code=200) - response = self.service_connection.get_saml_provider('arn') + self.service_connection.get_saml_provider('arn') self.assert_request_parameters( { @@ -146,7 +145,7 @@ class TestUpdateSamlProvider(AWSMockServiceTestCase): def test_update_saml_provider(self): self.set_http_response(status_code=200) - response = self.service_connection.update_saml_provider('arn', 'doc') + self.service_connection.update_saml_provider('arn', 'doc') self.assert_request_parameters( { @@ -165,7 +164,7 @@ class TestDeleteSamlProvider(AWSMockServiceTestCase): def test_delete_saml_provider(self): self.set_http_response(status_code=200) - response = self.service_connection.delete_saml_provider('arn') + self.service_connection.delete_saml_provider('arn') self.assert_request_parameters( { @@ -199,7 +198,7 @@ class TestCreateRole(AWSMockServiceTestCase): def test_create_role_default(self): self.set_http_response(status_code=200) - response = self.service_connection.create_role('a_name') + self.service_connection.create_role('a_name') self.assert_request_parameters( {'Action': 'CreateRole', @@ -210,7 +209,7 @@ class TestCreateRole(AWSMockServiceTestCase): def test_create_role_default_cn_north(self): self.set_http_response(status_code=200) self.service_connection.host = 'iam.cn-north-1.amazonaws.com.cn' - response = self.service_connection.create_role('a_name') + self.service_connection.create_role('a_name') self.assert_request_parameters( {'Action': 'CreateRole', @@ -220,7 +219,7 @@ class TestCreateRole(AWSMockServiceTestCase): def test_create_role_string_policy(self): self.set_http_response(status_code=200) - response = self.service_connection.create_role( + self.service_connection.create_role( 'a_name', # Historical usage. assume_role_policy_document='{"hello": "policy"}' @@ -234,7 +233,7 @@ class TestCreateRole(AWSMockServiceTestCase): def test_create_role_data_policy(self): self.set_http_response(status_code=200) - response = self.service_connection.create_role( + self.service_connection.create_role( 'a_name', # With plain data, we should dump it for them. assume_role_policy_document={"hello": "policy"} @@ -292,7 +291,7 @@ class TestGetSigninURL(AWSMockServiceTestCase): ) -class TestGetSigninURL(AWSMockServiceTestCase): +class TestGetSigninURLNoAliases(AWSMockServiceTestCase): connection_class = IAMConnection def default_body(self): @@ -317,7 +316,7 @@ class TestGetSigninURL(AWSMockServiceTestCase): class TestGenerateCredentialReport(AWSMockServiceTestCase): connection_class = IAMConnection - + def default_body(self): return b""" <GenerateCredentialReportResponse> @@ -333,9 +332,9 @@ class TestGenerateCredentialReport(AWSMockServiceTestCase): def test_generate_credential_report(self): self.set_http_response(status_code=200) response = self.service_connection.generate_credential_report() - self.assertEquals(response['generate_credential_report_response']\ - ['generate_credential_report_result']\ - ['state'], 'COMPLETE') + self.assertEquals(response['generate_credential_report_response'] + ['generate_credential_report_result'] + ['state'], 'COMPLETE') class TestGetCredentialReport(AWSMockServiceTestCase): @@ -354,10 +353,10 @@ class TestGetCredentialReport(AWSMockServiceTestCase): </GetCredentialReportResult> </GetCredentialReportResponse> """ + def test_get_credential_report(self): self.set_http_response(status_code=200) response = self.service_connection.get_credential_report() - b64decode(response['get_credential_report_response']\ - ['get_credential_report_result']\ + b64decode(response['get_credential_report_response'] + ['get_credential_report_result'] ['content']) - |