Use flake8 for future checking, and add missing ones

checkstyle.sh

@@ -6,15 +6,22 @@ find_source_files() {
 files=$(find_source_files)
 # These are acceptable (for now). 128 and 127 should be removed eventually.
 ignore='--ignore=E501,E128,E127'
+# 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.
+ignore=$ignore',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.
+ignore=$ignore',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
+# distros are updated
 ignore=$ignore',E265,E713,E111,E113,E402,E731'
 # For now, go through all the checking stages and only die at the end
 exit_code=0
 
-if ! pep8 $ignore --filename=*.py $(find_source_files); then
-    echo "ERROR: PEP8 does not pass."
+if ! flake8 $ignore --filename=*.py $(find_source_files); then
+    echo "ERROR: flake8 does not pass."
     exit_code=1
 fi
 
@@ -49,29 +56,4 @@ if $fail_py3_unicode; then
     exit_code=1
 fi
 
-check_future () {
-    fail_unicode_literals=false
-    for file in $files; do
-        if ! grep -L "from __future__ import $1" $file; then
-            fail_unicode_literals=true
-        fi
-    done
-    if $fail_unicode_literals; then
-        if $2; then
-            echo "ERROR: Above files do not have $1 import."
-            exit_code=1
-        else
-            echo "WARNING: Above files do not have $1 import."
-        fi
-    fi
-}
-for mandatory in unicode_literals
-do
-    check_future $mandatory true
-done
-for optional in division print_function absolute_import
-do
-    check_future $optional false
-done
-
 exit $exit_code

sopel/__init__.py

@@ -9,8 +9,7 @@
 
 http://sopel.chat/
 """
-from __future__ import unicode_literals
-from __future__ import absolute_import
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 from collections import namedtuple
 import os

sopel/bot.py

@@ -9,9 +9,7 @@
 
 http://sopel.chat/
 """
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import absolute_import
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import collections
 import os

sopel/config/__init__.py

@@ -17,9 +17,7 @@
 # Copyright © 2012, Elad Alfassa <elad@fedoraproject.org>
 # Licensed under the Eiffel Forum License 2.
 
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import absolute_import
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 from sopel.tools import iteritems, stderr
 import sopel.tools

sopel/config/core_section.py

@@ -1,7 +1,6 @@
 # coding=utf8
 
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import os.path
 

sopel/config/types.py

@@ -24,7 +24,7 @@
     ValueError: ListAttribute value must be a list.
 """
 
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 import os.path
 import sys
 from sopel.tools import get_input

sopel/coretasks.py

@@ -13,7 +13,7 @@
 responses to standard IRC codes without having to shove them all into the
 dispatch function in bot.py and making it easier to maintain.
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 
 import re

sopel/db.py

@@ -1,5 +1,5 @@
 # coding=utf-8
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import json
 import os.path

sopel/formatting.py

@@ -4,7 +4,7 @@
 The formatting module includes functions to apply IRC formatting to text."""
 # Copyright 2014, Edward D. Powell, embolalia.net
 # Licensed under the Eiffel Forum License 2.
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 import sys
 if sys.version_info.major >= 3:
     unicode = str

sopel/irc.py

@@ -12,9 +12,7 @@
 When working on core IRC protocol related features, consult protocol
 documentation at http://www.irchelp.org/irchelp/rfc/
 """
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import absolute_import
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import sys
 import re

sopel/loader.py

@@ -1,5 +1,5 @@
 # coding=utf-8
-from __future__ import unicode_literals, absolute_import
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import imp
 import os.path

sopel/logger.py

@@ -1,5 +1,5 @@
 # coding=utf-8
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import logging
 

sopel/module.py

@@ -16,7 +16,7 @@
 #Copyright 2013, Lior Ramati <firerogue517@gmail.com>
 #Licensed under the Eiffel Forum License 2.
 
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import sopel.test_tools
 import functools

sopel/modules/__init__.py

@@ -1,2 +1,2 @@
 # coding=utf8
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division

sopel/modules/admin.py

@@ -10,7 +10,7 @@
 
 http://sopel.chat
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 from sopel.config.types import (
     StaticSection, ValidatedAttribute, FilenameAttribute

sopel/modules/adminchannel.py

@@ -8,7 +8,7 @@
 http://sopel.chat/
 
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import re
 from sopel import formatting

sopel/modules/announce.py

@@ -5,7 +5,7 @@
 Licensed under the Eiffel Forum License 2.
 
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 from sopel.module import commands, example
 

sopel/modules/bugzilla.py

@@ -4,7 +4,7 @@
 Copyright 2013-2015, Embolalia, embolalia.com
 Licensed under the Eiffel Forum License 2.
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import xmltodict
 import re

sopel/modules/calc.py

@@ -6,7 +6,7 @@
 
 http://sopel.dfbta.net
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import re
 from sopel import web

sopel/modules/clock.py

@@ -7,7 +7,7 @@
 
 http://sopel.dfbta.net
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 try:
     import pytz

sopel/modules/countdown.py

@@ -6,7 +6,7 @@
 
 http://sopel.dfbta.net
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 from sopel.module import commands, NOLIMIT
 import datetime
 

sopel/modules/currency.py

@@ -5,7 +5,7 @@
 
 http://sopel.chat
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import json
 import xmltodict

sopel/modules/dice.py

@@ -7,7 +7,7 @@
 
 http://sopel.chat/
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 import random
 import re
 import operator

sopel/modules/etymology.py

@@ -6,7 +6,7 @@
 
 http://sopel.chat
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import re
 from sopel import web

sopel/modules/find.py

@@ -11,7 +11,7 @@
 This module will fix spelling errors if someone corrects them
 using the sed notation (s///) commonly found in vi/vim.
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import re
 from sopel.tools import Identifier, SopelMemory

sopel/modules/find_updates.py

@@ -8,7 +8,7 @@
 """
 # Copyright 2014, Edward D. Powell, embolalia.net
 # Licensed under the Eiffel Forum License 2.
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import json
 

sopel/modules/help.py

@@ -7,7 +7,7 @@
 
 http://sopel.chat
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import textwrap
 import collections

sopel/modules/ip.py

@@ -4,7 +4,7 @@
 # Copyright © 2013, Elad Alfassa <elad@fedoraproject.org>
 # Licensed under the Eiffel Forum License 2.
 
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import pygeoip
 import socket

sopel/modules/ipython.py

@@ -6,7 +6,7 @@
 
 Sopel: http://sopel.chat/
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 import sopel
 import sys
 if sys.version_info.major >= 3:

sopel/modules/isup.py

@@ -6,7 +6,7 @@
 
 This allows users to check if a website is up through isup.me.
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 from sopel import web
 from sopel.module import commands

sopel/modules/lmgtfy.py

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

sopel/modules/meetbot.py

@@ -6,7 +6,7 @@
 
 This module is an attempt to implement at least some of the functionallity of Debian's meetbot
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 import time
 import os
 from sopel.config.types import (

sopel/modules/movie.py

@@ -6,7 +6,7 @@
 
 This module relies on omdbapi.com
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 import json
 import sopel.web as web
 import sopel.module

sopel/modules/ping.py

@@ -4,7 +4,7 @@
 Author: Sean B. Palmer, inamidst.com
 About: http://sopel.chat
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import random
 from sopel.module import rule, priority, thread

sopel/modules/rand.py

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

sopel/modules/reddit.py

@@ -7,7 +7,7 @@
 This module provides special tools for reddit, namely showing detailed
 info about reddit posts
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 from sopel.module import commands, rule, example, NOLIMIT, OP
 from sopel.formatting import bold, color, colors

sopel/modules/reload.py

@@ -6,7 +6,7 @@
 
 http://sopel.chat
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import collections
 import sys

sopel/modules/remind.py

@@ -6,7 +6,7 @@
 
 http://sopel.chat
 """
-from __future__ import unicode_literals
+from __future__ import unicode_literals, absolute_import, print_function, division
 
 import os
 import re

sopel/modules/safety.py

@@ -6,8 +6,8 @@
 
 This module uses virustotal.com
 """
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import unicode_literals, absolute_import, print_function, division
+
 import sopel.web as web
 from sopel.config.types import StaticSection, ValidatedAttribute, ListAttribute
 from sopel.formatting import color, bold