linting

nficano · Oct 19, 2018 · d03b3ed · d03b3ed
1 parent d3db50f
commit d03b3ed
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 26 deletions.
diff --git a/artwork/tangerine.svg b/artwork/tangerine.svg
diff --git a/samples/image_me.py b/samples/image_me.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
     google image me
     ~~~~~~~~~~~~~~~
@@ -28,9 +29,15 @@ def image_me(user, message):
 
 
 def google_image_search(query):
-    resp = requests.get(URL, params={
-        'v': '1.0', 'searchType': 'image', 'q': query.strip(),
-        'cx': CSE_ID, 'key': CSE_KEY})
+    resp = requests.get(
+        URL, params={
+            'v': '1.0',
+            'searchType':
+            'image', 'q': query.strip(),
+            'cx': CSE_ID,
+            'key': CSE_KEY,
+        },
+    )
     if not resp.ok:
         yield
     for i in resp.json().get('items', []):

diff --git a/samples/reddit_rando.py b/samples/reddit_rando.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
     reddit rando (comment)
     ~~~~~~~~~~~~~~~~~~~~~~
@@ -62,9 +63,11 @@ def get_random_comment_in_subreddit(subreddit):
 
 
 def reddit_request(url):
-    resp = requests.get(url, headers={
-        'User-agent': 'darwin:slackbot:v1.2.3 (by /u/nficano)'
-    })
+    resp = requests.get(
+        url, headers={
+            'User-agent': 'darwin:slackbot:v1.2.3 (by /u/nficano)',
+        },
+    )
     if not resp.ok:
         return False, resp
     return True, resp.json()

diff --git a/setup.py b/setup.py
@@ -44,6 +44,7 @@ def run(self):
         os.system('twine upload dist/*')
         sys.exit()
 
+
 setup(
     name='slack-tangerine',
     version='4.1.4',

diff --git a/tangerine/bot.py b/tangerine/bot.py
@@ -20,13 +20,14 @@
 
 log = logging.getLogger(__name__)
 
-Listener = namedtuple('Listener', (
-    'rule',
-    'view_func',
-    'trigger',
-    'doc',
-    'options'
-    )
+Listener = namedtuple(
+    'Listener', (
+        'rule',
+        'view_func',
+        'trigger',
+        'doc',
+        'options',
+    ),
 )
 
 
@@ -44,7 +45,7 @@ def __init__(self, slack_token=None, settings=None):
         self.scheduled_tasks = []
 
         self.client = SlackClient(
-            slack_token or self.settings.tangerine.auth_token
+            slack_token or self.settings.tangerine.auth_token,
         )
         self.sleep = self.settings.tangerine.sleep
 
@@ -141,7 +142,7 @@ def respond(self, user, message, channel):
         sendable = {
             'user': user,
             'message': message,
-            'channel': channel
+            'channel': channel,
         }
         if not message:
             return
@@ -156,12 +157,14 @@ def respond(self, user, message, channel):
                         time.sleep(.2)
                         self.client.server.send_to_websocket({
                             'type': 'typing',
-                            'channel': channel
+                            'channel': channel,
                         })
                         time.sleep(.5)
                     if '{user.username}' in response:
-                        response = response.replace('{user.username}',
-                                                    self.get_user_name(user))
+                        response = response.replace(
+                            '{user.username}',
+                            self.get_user_name(user),
+                        )
                     self.speak(response, channel)
 
     def add_listener(self, rule, view_func, trigger, docs, **options):
@@ -173,15 +176,17 @@ def add_listener(self, rule, view_func, trigger, docs, **options):
         if not six.callable(view_func):
             raise TypeError('view_func should be callable')
         self.listeners.append(
-            Listener(rule, view_func, trigger, docs, options)
+            Listener(rule, view_func, trigger, docs, options),
         )
 
     def add_cron(self, schedule, f, **options):
         self.scheduled_tasks.append(Task(schedule, f, **options))
 
     def speak(self, message, channel, **kwargs):
-        self.client.api_call('chat.postMessage', as_user=True,
-                             channel=channel, text=message, **kwargs)
+        self.client.api_call(
+            'chat.postMessage', as_user=True,
+            channel=channel, text=message, **kwargs,
+        )
 
     def get_user_info(self, user_id):
         return self.client.api_call('users.info', user=user_id)
@@ -200,7 +205,8 @@ def get_channel_id_from_name(self, channel):
         types = ','.join(['public_channel', 'private_channel'])
 
         response = self.client.api_call(
-            'conversations.list', types=types, limit=1000)
+            'conversations.list', types=types, limit=1000,
+        )
         for c in response['channels']:
             if channel == c['name'].lower():
                 return c['id']
@@ -214,7 +220,8 @@ def get_channel_name_from_channel_id(self, channel_id):
         types = ','.join(['public_channel', 'private_channel'])
 
         response = self.client.api_call(
-            'conversations.list', types=types, limit=1000)
+            'conversations.list', types=types, limit=1000,
+        )
         for c in response['channels']:
             if channel_id == c['id']:
                 return c['name']
@@ -230,13 +237,13 @@ def get_template_path(self):
         else:
             return os.path.join(
                 os.getcwd(),
-                self.settings.tangerine.template_folder
+                self.settings.tangerine.template_folder,
             )
 
     def get_jinja_environment(self):
         return self.jinja_environment(
             loader=FileSystemLoader(self.get_template_path()),
-            autoescape=select_autoescape(['txt'])
+            autoescape=select_autoescape(['txt']),
         )
 
     def render_template(self, template_name, **context):