From 5df0f1befc3a935b0ae974ed8f9b4a11161badf7 Mon Sep 17 00:00:00 2001
From: Barry Ruffner <barry_ruffner@intuit.com>
Date: Tue, 3 Apr 2018 12:08:53 -0700
Subject: [PATCH] Fixes for automated tests linting.

---
 moto/cognitoidentity/models.py    | 48 +++++++++++++++----------------
 moto/cognitoidentity/responses.py | 11 ++++---
 moto/cognitoidentity/utils.py     |  2 --
 3 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/moto/cognitoidentity/models.py b/moto/cognitoidentity/models.py
index d0ec2d735..9b3ba0648 100644
--- a/moto/cognitoidentity/models.py
+++ b/moto/cognitoidentity/models.py
@@ -51,16 +51,16 @@ class CognitoIdentityBackend(BaseBackend):
         self.__dict__ = {}
         self.__init__(region)
 
-    def create_identity_pool(self, identity_pool_name, allow_unauthenticated_identities, 
+    def create_identity_pool(self, identity_pool_name, allow_unauthenticated_identities,
         supported_login_providers, developer_provider_name, open_id_connect_provider_arns,
-        cognito_identity_providers, saml_provider_arns):
+            cognito_identity_providers, saml_provider_arns):
 
-        new_identity = CognitoIdentity(self.region, identity_pool_name, 
-            allow_unauthenticated_identities=allow_unauthenticated_identities, 
-            supported_login_providers=supported_login_providers, 
-            developer_provider_name=developer_provider_name, 
+        new_identity = CognitoIdentity(self.region, identity_pool_name,
+            allow_unauthenticated_identities=allow_unauthenticated_identities,
+            supported_login_providers=supported_login_providers,
+            developer_provider_name=developer_provider_name,
             open_id_connect_provider_arns=open_id_connect_provider_arns,
-            cognito_identity_providers=cognito_identity_providers, 
+            cognito_identity_providers=cognito_identity_providers,
             saml_provider_arns=saml_provider_arns)
         self.identity_pools[new_identity.identity_pool_id] = new_identity
 
@@ -77,7 +77,6 @@ class CognitoIdentityBackend(BaseBackend):
 
         return response
 
-
     def get_id(self):
         identity_id = {'IdentityId': get_random_identity_id(self.region)}
         return json.dumps(identity_id)
@@ -88,14 +87,14 @@ class CognitoIdentityBackend(BaseBackend):
         expiration = now + datetime.timedelta(seconds=duration)
         expiration_str = str(iso_8601_datetime_with_milliseconds(expiration))
         return json.dumps({
-           "Credentials": { 
-              "AccessKeyId": "TESTACCESSKEY12345",
-              "Expiration": expiration_str,
-              "SecretKey": "ABCSECRETKEY",
-              "SessionToken": "ABC12345"
-           },
-           "IdentityId": identity_id
-        })
+               "Credentials": {
+                  "AccessKeyId": "TESTACCESSKEY12345",
+                  "Expiration": expiration_str,
+                  "SecretKey": "ABCSECRETKEY",
+                  "SessionToken": "ABC12345"
+               },
+               "IdentityId": identity_id
+            })
 
     def get_open_id_token_for_developer_identity(self, identity_id):
         duration = 90
@@ -103,14 +102,15 @@ class CognitoIdentityBackend(BaseBackend):
         expiration = now + datetime.timedelta(seconds=duration)
         expiration_str = str(iso_8601_datetime_with_milliseconds(expiration))
         return json.dumps({
-           "Credentials": { 
-              "AccessKeyId": "TESTACCESSKEY12345",
-              "Expiration": expiration_str,
-              "SecretKey": "ABCSECRETKEY",
-              "SessionToken": "ABC12345"
-           },
-           "IdentityId": identity_id
-        })
+               "Credentials": {
+                  "AccessKeyId": "TESTACCESSKEY12345",
+                  "Expiration": expiration_str,
+                  "SecretKey": "ABCSECRETKEY",
+                  "SessionToken": "ABC12345"
+               },
+               "IdentityId": identity_id
+            })
+
 
 cognitoidentity_backends = {}
 for region in boto.cognito.identity.regions():
diff --git a/moto/cognitoidentity/responses.py b/moto/cognitoidentity/responses.py
index 2285607a9..33afd47c1 100644
--- a/moto/cognitoidentity/responses.py
+++ b/moto/cognitoidentity/responses.py
@@ -30,11 +30,11 @@ class CognitoIdentityResponse(BaseResponse):
         saml_provider_arns = self._get_param('SamlProviderARNs')
         return cognitoidentity_backends[self.region].create_identity_pool(
             identity_pool_name=identity_pool_name,
-            allow_unauthenticated_identities=allow_unauthenticated_identities, 
-            supported_login_providers=supported_login_providers, 
+            allow_unauthenticated_identities=allow_unauthenticated_identities,
+            supported_login_providers=supported_login_providers,
             developer_provider_name=developer_provider_name,
-            open_id_connect_provider_arns=open_id_connect_provider_arns, 
-            cognito_identity_providers=cognito_identity_providers, 
+            open_id_connect_provider_arns=open_id_connect_provider_arns,
+            cognito_identity_providers=cognito_identity_providers,
             saml_provider_arns=saml_provider_arns)
 
     def get_id(self):
@@ -44,5 +44,4 @@ class CognitoIdentityResponse(BaseResponse):
         return cognitoidentity_backends[self.region].get_credentials_for_identity(self._get_param('IdentityId'))
 
     def get_open_id_token_for_developer_identity(self):
-        return cognitoidentity_backends[self.region].get_open_id_token_for_developer_identity(self._get_param('IdentityId'))
-
+        return cognitoidentity_backends[self.region].get_open_id_token_for_developer_identity(self._get_param('IdentityId'))
\ No newline at end of file
diff --git a/moto/cognitoidentity/utils.py b/moto/cognitoidentity/utils.py
index d885e0e81..359631763 100644
--- a/moto/cognitoidentity/utils.py
+++ b/moto/cognitoidentity/utils.py
@@ -1,5 +1,3 @@
-import collections
-import six
 from moto.core.utils import get_random_hex