style fixes

Author: mdumandag

highfive/app.py

@@ -7,15 +7,15 @@
 import sys
 import traceback
 
-from .config import Config, InvalidTokenException
-from .newpr import HighfiveHandler, UnsupportedRepoError
-from .payload import Payload
-
 import click
 import dotenv
 import flask
 import waitress
 
+from .config import Config, InvalidTokenException
+from .newpr import HighfiveHandler, UnsupportedRepoError
+from .payload import Payload
+
 
 def create_app(config, webhook_secrets=None, config_dir=None):
     if webhook_secrets is None:
@@ -45,7 +45,7 @@ def new_pr():
                 expected = hmac.new(webhook_secret.encode("utf-8"), digestmod=hashlib.sha1)
                 expected.update(raw_data)
                 expected = expected.hexdigest()
-                if hmac.compare_digest('sha1='+expected, signature):
+                if hmac.compare_digest('sha1=' + expected, signature):
                     break
             else:
                 return 'Error: invalid signature\n', 403

highfive/irc.py

@@ -1,11 +1,13 @@
 import socket
 import time
 
+
 class IrcClient(object):
     """ A simple IRC client to send a message and then leave.
     the calls to `time.sleep` are so the socket has time to recognize
     responses from the IRC protocol
     """
+
     def __init__(self, target, nick="rust-highfive", should_join=False):
         self.target = target.encode("utf-8")
         self.nick = nick.encode("utf-8")
@@ -17,7 +19,7 @@ def __init__(self, target, nick="rust-highfive", should_join=False):
         time.sleep(2)
 
     def join(self):
-        self.ircsock.send(b"JOIN " + self.targert + b"\r\n")
+        self.ircsock.send(b"JOIN " + self.target + b"\r\n")
 
     def send(self, msg):
         if type(msg) == str:
@@ -28,7 +30,7 @@ def send(self, msg):
                 print("Timeout! EXITING")
                 return
             ircmsg = self.ircsock.recv(2048).strip()
-            #if ircmsg: print(ircmsg)
+            # if ircmsg: print(ircmsg)
 
             if ircmsg.find(self.nick + b" +x") != -1:
                 self.ircsock.send(b"PRIVMSG " + self.target + b" :" + msg + b"\r\n")

highfive/newpr.py

@@ -1,18 +1,16 @@
 #!/usr/bin/env python3
 
-import urllib
-import cgi
-import cgitb
-from copy import deepcopy
+import gzip
 import json
+import os
 import random
+import re
+import urllib
 from configparser import ConfigParser
+from copy import deepcopy
 from io import StringIO
-import gzip
-import re
-import os
 
-from highfive import irc, payload
+from highfive import irc
 
 # Maximum per page is 100. Sorted by number of commits, so most of the time the
 # contributor will happen early,
@@ -39,13 +37,15 @@
 review_without_reviewer = '@%s: no appropriate reviewer found, use r? to override'
 
 reviewer_re = re.compile("\\b[rR]\?[:\- ]*@([a-zA-Z0-9\-]+)")
-submodule_re = re.compile(".*\+Subproject\scommit\s.*", re.DOTALL|re.MULTILINE)
+submodule_re = re.compile(".*\+Subproject\scommit\s.*", re.DOTALL | re.MULTILINE)
 
 rustaceans_api_url = "http://www.ncameron.org/rustaceans/user?username={username}"
 
+
 class UnsupportedRepoError(IOError):
     pass
 
+
 class HighfiveHandler(object):
     def __init__(self, payload, config, config_dir=None):
         self.payload = payload
@@ -57,7 +57,7 @@ def __init__(self, payload, config, config_dir=None):
         self.repo_config = self.load_repo_config()
 
     def load_repo_config(self):
-        '''Load the repository configuration.'''
+        """Load the repository configuration."""
         (org, repo) = self.payload['repository', 'full_name'].split('/')
         try:
             return self._load_json_file(os.path.join(org, repo) + '.json')
@@ -103,7 +103,7 @@ def api_req(self, method, url, data=None, media_type=None):
             buf = StringIO(f.read())
             f = gzip.GzipFile(fileobj=buf)
         body = f.read().decode("utf-8")
-        return { "header": header, "body": body }
+        return {"header": header, "body": body}
 
     def set_assignee(self, assignee, owner, repo, issue, user, author, to_mention):
         try:
@@ -122,7 +122,7 @@ def set_assignee(self, assignee, owner, repo, issue, user, author, to_mention):
             if irc_name_of_reviewer:
                 client = irc.IrcClient(target="#rust-bots")
                 client.send_then_quit("{}: ping to review issue https://www.github.com/{}/{}/pull/{} by {}."
-                    .format(irc_name_of_reviewer, owner, repo, issue, author))
+                                      .format(irc_name_of_reviewer, owner, repo, issue, author))
         self.run_commands(to_mention, owner, repo, issue, user)
 
     def run_commands(self, to_mention, owner, repo, issue, user):
@@ -217,8 +217,7 @@ def review_msg(self, reviewer, submitter):
             else review_with_reviewer % reviewer
 
     def unexpected_branch(self):
-        """ returns (expected_branch, actual_branch) if they differ, else False
-        """
+        """ returns (expected_branch, actual_branch) if they differ, else False"""
 
         # If unspecified, assume master.
         expected_target = self.repo_config.get('expected_branch', 'master')
@@ -249,16 +248,16 @@ def is_new_contributor(self, username, owner, repo):
                 raise e
 
     def find_reviewer(self, msg):
-        '''
+        """
         If the user specified a reviewer, return the username, otherwise returns
         None.
-        '''
+        """
         if msg is not None:
             match = reviewer_re.search(msg)
             return match.group(1) if match else None
 
     def choose_reviewer(self, repo, owner, diff, exclude):
-        '''Choose a reviewer for the PR.'''
+        """Choose a reviewer for the PR."""
         # Get JSON data on reviewers.
         dirs = self.repo_config.get('dirs', {})
         groups = deepcopy(self.repo_config['groups'])
@@ -311,7 +310,6 @@ def choose_reviewer(self, repo, owner, diff, exclude):
         if not potential:
             potential = groups['core']
 
-
         # expand the reviewers list by group
         reviewers = []
         seen = {"all"}
@@ -337,9 +335,9 @@ def choose_reviewer(self, repo, owner, diff, exclude):
         return None
 
     def get_to_mention(self, diff):
-        '''
+        """
         Get the list of people to mention.
-        '''
+        """
         dirs = self.repo_config.get('dirs', {})
         mentions = self.repo_config.get('mentions', {})
 
@@ -428,7 +426,7 @@ def new_pr(self):
     def new_comment(self):
         # Check the issue is a PR and is open.
         if self.payload['issue', 'state'] != 'open' \
-           or 'pull_request' not in self.payload['issue']:
+                or 'pull_request' not in self.payload['issue']:
             return
 
         commenter = self.payload['comment', 'user', 'login']
@@ -442,8 +440,8 @@ def new_comment(self):
         # Check the commenter is the submitter of the PR or the previous assignee.
         author = self.payload['issue', 'user', 'login']
         if not (author == commenter or (
-                    self.payload['issue', 'assignee'] \
-                    and commenter == self.payload['issue', 'assignee', 'login']
+                self.payload['issue', 'assignee'] \
+                and commenter == self.payload['issue', 'assignee', 'login']
         )):
             # Check if commenter is a collaborator.
             if not self.is_collaborator(commenter, owner, repo):

highfive/tests/fakes.py

@@ -1,38 +1,42 @@
-from highfive import payload
 import json
 import os
 
+from highfive import payload
+
+
 def load_fake(fake):
     fakes_dir = os.path.join(os.path.dirname(__file__), 'fakes')
 
     with open(os.path.join(fakes_dir, fake)) as fake:
         return fake.read()
 
+
 def get_fake_filename(name):
     return os.path.join(os.path.dirname(__file__), 'fakes', name)
 
+
 def get_repo_configs():
     return {
         'individuals_no_dirs': {
-            "groups": { "all": ["@pnkfelix", "@nrc"] },
+            "groups": {"all": ["@pnkfelix", "@nrc"]},
             "dirs": {},
         },
         'individuals_no_dirs_labels': {
-            "groups": { "all": ["@pnkfelix", "@nrc"] },
+            "groups": {"all": ["@pnkfelix", "@nrc"]},
             "dirs": {},
             "new_pr_labels": ["a", "b"],
         },
         'individuals_dirs': {
-            "groups": { "all": ["@pnkfelix", "@nrc"] },
-            "dirs": { "src/librustc": ["@aturon"] },
+            "groups": {"all": ["@pnkfelix", "@nrc"]},
+            "dirs": {"src/librustc": ["@aturon"]},
         },
         'individuals_dirs_2': {
-            "groups": { "all": ["@pnkfelix", "@nrc"] },
-            "dirs": { "src/foobazdir": ["@aturon"] },
+            "groups": {"all": ["@pnkfelix", "@nrc"]},
+            "dirs": {"src/foobazdir": ["@aturon"]},
         },
         'individual_files': {
-            "groups": { "all": ["@pnkfelix", "@nrc"] },
-            "dirs": { ".travis.yml":  ["@aturon"] },
+            "groups": {"all": ["@pnkfelix", "@nrc"]},
+            "dirs": {".travis.yml": ["@aturon"]},
         },
         'circular_groups': {
             "groups": {
@@ -41,11 +45,12 @@ def get_repo_configs():
             },
         },
         'empty': {
-            "groups": { "all": [] },
+            "groups": {"all": []},
             "dirs": {},
         },
     }
 
+
 def get_global_configs():
     return {
         'base': {
@@ -54,10 +59,11 @@ def get_global_configs():
             }
         },
         'has_all': {
-            "groups": { "all": ["@alexcrichton"] }
+            "groups": {"all": ["@alexcrichton"]}
         },
     }
 
+
 class Payload(object):
     @staticmethod
     def new_comment():
@@ -67,8 +73,8 @@ def new_comment():
 
     @staticmethod
     def new_pr(
-        number=7, pr_body='The PR comment.', pr_url='https://the.url/',
-        repo_name='repo-name', repo_owner='repo-owner', pr_author='prAuthor'
+            number=7, pr_body='The PR comment.', pr_url='https://the.url/',
+            repo_name='repo-name', repo_owner='repo-owner', pr_author='prAuthor'
     ):
         with open(get_fake_filename('open-pr.payload'), 'r') as fin:
             p = json.load(fin)

highfive/tests/patcherize.py

@@ -7,9 +7,9 @@ def patcherize():
     patchers = {}
 
     def _patcherize(patcher_names=None):
-        for n,p in (patcher_names or ()):
+        for n, p in (patcher_names or ()):
             patchers[n] = mock.patch(p)
-        return {n: p.start() for n,p in patchers.items()}
+        return {n: p.start() for n, p in patchers.items()}
 
     yield _patcherize
 

highfive/tests/test_configs.py

@@ -1,18 +1,18 @@
-from copy import deepcopy
 import json
-from jsonschema import validate
-from jsonschema.exceptions import ValidationError
 import os
-import pytest
+from copy import deepcopy
 
+import pytest
+from jsonschema import validate
+from jsonschema.exceptions import ValidationError
 
 CONFIG_SCHEMA = {
     "type": "object",
     "required": [
         "groups",
     ],
     "properties": {
-        "contributing" : {
+        "contributing": {
             "type": "string",
         },
         "dirs": {
@@ -82,6 +82,7 @@
 GLOBAL_SCHEMA = deepcopy(CONFIG_SCHEMA)
 del GLOBAL_SCHEMA['properties']['groups']['required']
 
+
 def config_valid(fname):
     with open(fname, 'r') as fin:
         try:
@@ -100,6 +101,7 @@ def config_valid(fname):
 
     return True
 
+
 @pytest.mark.config
 @pytest.mark.hermetic
 @pytest.fixture