From 0094283cabdb417da9b8a52210371c1f50524a4a Mon Sep 17 00:00:00 2001
From: Sourcery AI <>
Date: Thu, 16 Jul 2020 07:07:37 +0000
Subject: [PATCH] 'Refactored by Sourcery'

---
 gmailApp/gmail_client.py                     | 21 ++++++++++----------
 kimsufi/verify-server-availabilty-kimsufi.py |  4 ++--
 rancher-services-check-updates/main.py       |  8 ++++----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/gmailApp/gmail_client.py b/gmailApp/gmail_client.py
index 86ed92d..d98020e 100644
--- a/gmailApp/gmail_client.py
+++ b/gmailApp/gmail_client.py
@@ -52,14 +52,16 @@ def searchMessages(
         :param fields:
         :return:
         """
-        params = {}
-        params['userId'] = userId
-        params['labelIds'] = labelIds
-        params['q'] = q
-        params['pageToken'] = pageToken
-        params['maxResults'] = maxResults
-        params['includeSpamTrash'] = includeSpamTrash
-        params['fields'] = fields
+        params = {
+            'userId': userId,
+            'labelIds': labelIds,
+            'q': q,
+            'pageToken': pageToken,
+            'maxResults': maxResults,
+            'includeSpamTrash': includeSpamTrash,
+            'fields': fields,
+        }
+
         return self.__service.users().messages().list(**params).execute()
 
     def deleteMessages(self, ids, userId='me'):
@@ -72,8 +74,7 @@ def deleteMessages(self, ids, userId='me'):
         if not isinstance(ids, list):
             raise ValueError('Ids should be a list of id')
         else:
-            body = {}
-            body['ids'] = ids
+            body = {'ids': ids}
             return self.__service.users().messages().batchDelete(userId=userId, body=body).execute()
 
     def trashMessages(self, messageId, userId='me'):
diff --git a/kimsufi/verify-server-availabilty-kimsufi.py b/kimsufi/verify-server-availabilty-kimsufi.py
index d8b847e..5225bcb 100755
--- a/kimsufi/verify-server-availabilty-kimsufi.py
+++ b/kimsufi/verify-server-availabilty-kimsufi.py
@@ -125,7 +125,7 @@ def send_mail(me, you, message, subject):
                   you=args.target,
                   message='Purchase link : https://www.kimsufi.com/fr/commande/kimsufi.xml?reference=' + args.server,
                   subject=MAIL_SUBJECT.format(args.server))
-        logging.info('Done.')
     else:
         logging.info(args.server + ' not found.')
-        logging.info('Done.')
+
+    logging.info('Done.')
diff --git a/rancher-services-check-updates/main.py b/rancher-services-check-updates/main.py
index 851ef1e..e42a47c 100644
--- a/rancher-services-check-updates/main.py
+++ b/rancher-services-check-updates/main.py
@@ -152,16 +152,16 @@ def get_last_tag(image_name):
             # Ask for credentials if not set on cli
             ask = input(
                 'Image {} unknown\nDo you want to try with your DockerHub credentials ? (y/n) '.format(image_name))
-            if ask == 'y' or ask == 'Y' or ask == 'yes':
+            if ask in ['y', 'Y', 'yes']:
                 DOCKER_HUB_USERNAME = input('Username ? ')
                 DOCKER_HUB_PASSWORD = input('Password ? ')
             else:
                 return 'undefined (Private repository ?)'
 
         r = get_request(url, jwt_auth=True, token=get_docker_token())
-        if 'results' not in r:
-            logging.error('Invalid password or username, by pass')
-            return 'undefined'
+    if 'results' not in r:
+        logging.error('Invalid password or username, by pass')
+        return 'undefined'
 
     # on each case, return the last tag
     for tag in r['results']: