apply lrowe flake8 fix to my fork

lib/diazo/compiler.py

@@ -9,19 +9,16 @@
               theme="//div[@id='page-content']"/>
     </rules>\
 """
-usage = __doc__
-
 import logging
 import pkg_resources
-
 from lxml import etree
 from six import string_types
-
 from diazo.rules import process_rules
 from diazo.utils import pkg_xsl, _createOptionParser, CustomResolver
 from diazo.utils import quote_param, split_params
 
 logger = logging.getLogger('diazo')
+usage = __doc__
 
 
 def set_parser(stylesheet, parser, compiler_parser=None):

lib/diazo/cssrules.py

@@ -10,17 +10,15 @@
 </rules>\
 """
 from __future__ import absolute_import
-usage = __doc__
-
 from optparse import OptionParser
 from lxml import etree
 from experimental.cssselect import css_to_xpath
-
 from . import utils
-
 import sys
 import logging
+
 logger = logging.getLogger('diazo')
+usage = __doc__
 
 
 def convert_css_selectors(rules):

lib/diazo/rules.py

@@ -4,20 +4,17 @@
 
 Preprocess RULES, an diazo rules file
 """
-usage = __doc__
-
 import logging
 import re
-
 from lxml import etree
 from six import string_types
 from future.moves.urllib.parse import urljoin
 from future.moves.urllib.request import urlopen
-
 from diazo.cssrules import convert_css_selectors
 from diazo.utils import namespaces, fullname, pkg_xsl, _createOptionParser
 
 logger = logging.getLogger('diazo')
+usage = __doc__
 
 IMPORT_STYLESHEET = re.compile(
     r'''(?P<before>@import[ \t]+(?P<paren>url\([ \t]?)?(?P<quote>['"]?))'''

lib/diazo/run.py

@@ -7,22 +7,18 @@
 
 Usage: %prog -r RULES [options] CONTENT
 """
-usage = __doc__
-
 import logging
 import sys
 import os.path
-
 from lxml import etree
 from six import string_types
-
 from diazo.compiler import compile_theme
 from diazo.utils import AC_READ_NET, AC_READ_FILE, _createOptionParser
 from diazo.utils import split_params, quote_param
-
 import diazo.runtrace
 
 logger = logging.getLogger('diazo')
+usage = __doc__
 
 
 class RunResolver(etree.Resolver):

lib/diazo/tests/test_diazo.py

@@ -9,9 +9,7 @@
 import difflib
 from io import BytesIO
 import unittest
-import future.standard_library
-with future.standard_library.hooks():
-    import configparser
+import configparser
 import pkg_resources
 
 import diazo.compiler