Merge pull request #1561 from sopel-irc/unignore-more-style-checks

Unignore more style checks

dev-requirements.txt

@@ -3,4 +3,5 @@ coveralls
 flake8<3.6.0; python_version == '3.3'
 flake8>=3.6.0,<3.7.0; python_version != '3.3'
 flake8-coding
+flake8-future-import
 setuptools<40.0; python_version == '3.3'

setup.cfg

@@ -5,17 +5,20 @@ ignore =
     E501,E128,E127,
     # These are ignored by default (and we want to keep them ignored)
     W504,
-    # These are forbidding certain __future__ imports. The plugin has errors both
-    # for having and not having them; we want to always have them, so we ignore
-    # the having them errors and keep the not having them errors.
-    FI50,FI51,FI52,FI53,FI54,FI55,
-    # F12 is with_statement, which is already in 2.7. F15 requires and F55 forbids
-    # generator_stop, which should probably be made mandatory at some point.
-    F12,F15,F55,
-    # These are rules that are relatively new or have had their definitions tweaked
-    # recently, so we'll forgive them until versions of PEP8 in various developers'
-    # distros are updated
-    E265,E713,E111,E113,E402,E731
+    # These are forbidding certain __future__ imports. The future-import plugin
+    # has errors both for having and not having them; we want to have these until
+    # Sopel no longer supports Python versions that require them.
+    FI50,FI51,FI53,FI54,FI55,
+    # These would require future imports that are not needed any more on Sopel's
+    # oldest supported Python version (2.7).
+    FI12,FI16,FI17,
+    # We ignore the error for missing generator_stop because it's only available
+    # in Python 3.5+ (switch this to FI55 in the above list when Sopel drops
+    # support for Python older than 3.5)
+    FI15
+    # flake8-future-import doesn't support (as of last update) the "annotations"
+    # feature added in Python 3.7, but it should be ignored too when/if this is
+    # ever released: https://github.com/xZise/flake8-future-import/pull/19
 exclude =
     docs/*,
     env/*,

sopel/__init__.py

@@ -12,8 +12,11 @@
 
 from __future__ import unicode_literals, absolute_import, print_function, division
 
+from collections import namedtuple
 import locale
+import re
 import sys
+
 loc = locale.getlocale()
 if sys.version_info.major > 2:
     if not loc[1] or 'UTF-8' not in loc[1]:
@@ -22,10 +25,6 @@
               'stupid things. If you get strange errors, please set it to '
               'something like "en_US.UTF-8".', file=sys.stderr)
 
-
-from collections import namedtuple
-import re
-
 __version__ = '6.6.6'
 
 

sopel/bot.py

@@ -402,7 +402,6 @@ def call(self, func, sopel, trigger):
             if func in self._times[nick]:
                 usertimediff = current_time - self._times[nick][func]
                 if func.rate > 0 and usertimediff < func.rate:
-                    #self._times[nick][func] = current_time
                     LOGGER.info(
                         "%s prevented from using %s in %s due to user limit: %d < %d",
                         trigger.nick, func.__name__, trigger.sender, usertimediff,
@@ -412,7 +411,6 @@ def call(self, func, sopel, trigger):
             if func in self._times[self.nick]:
                 globaltimediff = current_time - self._times[self.nick][func]
                 if func.global_rate > 0 and globaltimediff < func.global_rate:
-                    #self._times[self.nick][func] = current_time
                     LOGGER.info(
                         "%s prevented from using %s in %s due to global limit: %d < %d",
                         trigger.nick, func.__name__, trigger.sender, globaltimediff,
@@ -423,7 +421,6 @@ def call(self, func, sopel, trigger):
             if not trigger.is_privmsg and func in self._times[trigger.sender]:
                 chantimediff = current_time - self._times[trigger.sender][func]
                 if func.channel_rate > 0 and chantimediff < func.channel_rate:
-                    #self._times[trigger.sender][func] = current_time
                     LOGGER.info(
                         "%s prevented from using %s in %s due to channel limit: %d < %d",
                         trigger.nick, func.__name__, trigger.sender, chantimediff,

sopel/cli/run.py

@@ -10,27 +10,15 @@
 """
 from __future__ import unicode_literals, absolute_import, print_function, division
 
-import sys
-
-from sopel import tools
-
-if sys.version_info < (2, 7):
-    tools.stderr('Error: Requires Python 2.7 or later. Try python2.7 sopel')
-    sys.exit(1)
-if sys.version_info.major == 2:
-    tools.stderr('Warning: Python 2.x is near end of life. Sopel support at that point is TBD.')
-if sys.version_info.major == 3 and sys.version_info.minor < 3:
-    tools.stderr('Error: When running on Python 3, Python 3.3 is required.')
-    sys.exit(1)
-
 import argparse
 import os
 import platform
 import signal
+import sys
 import time
 import traceback
 
-from sopel import bot, logger, __version__
+from sopel import bot, logger, tools, __version__
 from sopel.config import (
     Config,
     _create_config,
@@ -41,6 +29,14 @@
 )
 from . import utils
 
+if sys.version_info < (2, 7):
+    tools.stderr('Error: Requires Python 2.7 or later. Try python2.7 sopel')
+    sys.exit(1)
+if sys.version_info.major == 2:
+    tools.stderr('Warning: Python 2.x is near end of life. Sopel support at that point is TBD.')
+if sys.version_info.major == 3 and sys.version_info.minor < 3:
+    tools.stderr('Error: When running on Python 3, Python 3.3 is required.')
+    sys.exit(1)
 
 ERR_CODE = 1
 """Error code: program exited with an error"""
@@ -635,7 +631,7 @@ def main(argv=None):
         parser = build_parser()
 
         # make sure to have an action first (`legacy` by default)
-        # TODO: `start` should be the default in Sopel 8
+        # TODO: `start` should be the default in Sopel 8
         argv = argv or sys.argv[1:]
         if not argv:
             argv = ['legacy']

sopel/config/__init__.py

@@ -19,19 +19,20 @@
 
 from __future__ import unicode_literals, absolute_import, print_function, division
 
-from sopel.tools import iteritems, stderr
-import sopel.tools
-from sopel.tools import get_input
-import sopel.loader
 import os
 import sys
+
+import sopel.config.core_section
+from sopel.config.types import StaticSection
+import sopel.loader
+import sopel.tools
+from sopel.tools import get_input, iteritems, stderr
+
 if sys.version_info.major < 3:
     import ConfigParser
 else:
     basestring = str
     import configparser as ConfigParser
-import sopel.config.core_section
-from sopel.config.types import StaticSection
 
 
 DEFAULT_HOMEDIR = os.path.join(os.path.expanduser('~'), '.sopel')

sopel/modules/calc.py

@@ -15,7 +15,9 @@
 
 if sys.version_info.major < 3:
     from urllib import quote as _quote
-    quote = lambda s: _quote(s.encode('utf-8')).decode('utf-8')
+
+    def quote(s):
+        return _quote(s.encode('utf-8')).decode('utf-8')
 else:
     from urllib.parse import quote
 

sopel/modules/dice.py

@@ -197,7 +197,9 @@ def roll(bot, trigger):
     arg_str = arg_str.replace("%", "%%")
     arg_str = re.sub(dice_regexp, "%s", arg_str)
 
-    f = lambda dice_expr: _roll_dice(bot, dice_expr)
+    def f(dice_expr):
+        return _roll_dice(bot, dice_expr)
+
     dice = list(map(f, dice_expressions))
 
     if None in dice:

sopel/modules/emoticons.py

@@ -6,7 +6,7 @@
 
 https://sopel.chat
 """
-from __future__ import unicode_literals, absolute_import
+from __future__ import unicode_literals, absolute_import, print_function, division
 from sopel.module import commands, example
 
 

sopel/modules/find.py

@@ -102,9 +102,12 @@ def findandreplace(bot, trigger):
     # off case sensitivity. re.U turns on unicode replacement.
     if 'i' in flags:
         regex = re.compile(re.escape(rest[0]), re.U | re.I)
-        repl = lambda s: re.sub(regex, rest[1], s, count == 1)
+
+        def repl(s):
+            return re.sub(regex, rest[1], s, count == 1)
     else:
-        repl = lambda s: s.replace(rest[0], rest[1], count)
+        def repl(s):
+            return s.replace(rest[0], rest[1], count)
 
     # Look back through the user's lines in the channel until you find a line
     # where the replacement works

sopel/modules/help.py

@@ -42,7 +42,9 @@ def help(bot, trigger):
             if len(bot.doc[name][0]) + (1 if bot.doc[name][1] else 0) > threshold:
                 if trigger.nick != trigger.sender:  # don't say that if asked in private
                     bot.reply('The documentation for this command is too long; I\'m sending it to you in a private message.')
-                msgfun = lambda l: bot.msg(trigger.nick, l)
+
+                def msgfun(l):
+                    bot.msg(trigger.nick, l)
             else:
                 msgfun = bot.reply
 

sopel/modules/isup.py

@@ -24,7 +24,7 @@ def isup(bot, trigger):
         else:
             site = 'http://' + site
 
-    if not '.' in site:
+    if '.' not in site:
         site += ".com"
 
     try:

sopel/modules/search.py

@@ -7,18 +7,20 @@
 import re
 import sys
 
-if sys.version_info.major < 3:
-    from urllib import unquote as _unquote
-    unquote = lambda s: _unquote(s.encode('utf-8')).decode('utf-8')
-else:
-    from urllib.parse import unquote
-
 import requests
 import xmltodict
 
 from sopel import web
 from sopel.module import commands, example
 
+if sys.version_info.major < 3:
+    from urllib import unquote as _unquote
+
+    def unquote(s):
+        return _unquote(s.encode('utf-8')).decode('utf-8')
+else:
+    from urllib.parse import unquote
+
 
 def formatnumber(n):
     """Format a number with beautiful commas."""

sopel/modules/tell.py

@@ -107,12 +107,12 @@ def f_remind(bot, trigger):
     if tellee == bot.nick:
         return bot.reply("I'm here now, you can tell me whatever you want!")
 
-    if not tellee in (Identifier(teller), bot.nick, 'me'):
+    if tellee not in (Identifier(teller), bot.nick, 'me'):
         tz = get_timezone(bot.db, bot.config, None, tellee)
         timenow = format_time(bot.db, bot.config, tz, tellee)
         bot.memory['tell_lock'].acquire()
         try:
-            if not tellee in bot.memory['reminders']:
+            if tellee not in bot.memory['reminders']:
                 bot.memory['reminders'][tellee] = [(teller, verb, timenow, msg)]
             else:
                 bot.memory['reminders'][tellee].append((teller, verb, timenow, msg))

sopel/modules/wikipedia.py

@@ -12,8 +12,12 @@
 if sys.version_info.major < 3:
     from urllib import quote as _quote
     from urlparse import unquote as _unquote
-    quote = lambda s: _quote(s.encode('utf-8')).decode('utf-8')
-    unquote = lambda s: _unquote(s.encode('utf-8')).decode('utf-8')
+
+    def quote(s):
+        return _quote(s.encode('utf-8')).decode('utf-8')
+
+    def unquote(s):
+        return _unquote(s.encode('utf-8')).decode('utf-8')
 else:
     from urllib.parse import quote, unquote
 

sopel/test_tools.py

@@ -34,8 +34,6 @@
 class MockConfig(sopel.config.Config):
     def __init__(self):
         self.filename = tempfile.mkstemp()[1]
-        #self._homedir = tempfile.mkdtemp()
-        #self.filename = os.path.join(self._homedir, 'test.cfg')
         self.parser = ConfigParser.RawConfigParser(allow_no_value=True)
         self.parser.add_section('core')
         self.parser.set('core', 'owner', 'Embolalia')

test/test_loader.py

@@ -1,5 +1,7 @@
 # coding=utf-8
-"""Test for the ``sopel.loader`` module."""
+"""Tests for the ``sopel.loader`` module."""
+from __future__ import unicode_literals, absolute_import, print_function, division
+
 import imp
 import inspect
 import os