Merge branch 'master' of https://github.com/verixx/modmail

Author: kyb3r

.lint.py

@@ -6,12 +6,11 @@
 
 THRESHOLD = 9.75
 
-cogs = [join('cogs', c) for c in listdir('cogs') if c.endswith('.py')]
-core = [join('core', c) for c in listdir('core') if c.endswith('.py')]
+cogs = [join("cogs", c) for c in listdir("cogs") if c.endswith(".py")]
+core = [join("core", c) for c in listdir("core") if c.endswith(".py")]
 
-results = Run(['bot.py', *cogs, *core],
-              do_exit=False)
+results = Run(["bot.py", *cogs, *core], do_exit=False)
 
-score = results.linter.stats['global_note']
+score = results.linter.stats["global_note"]
 if score <= THRESHOLD:
     sys.exit(1)

.pylintrc

@@ -80,7 +80,9 @@ disable=raw-checker-failed,
         too-many-arguments,
         too-few-public-methods,
         too-many-lines,
-        line-too-long
+        line-too-long,
+        bad-continuation,
+        invalid-name
 
 
 # Enable the message, report, category or checker with the given id(s). You can