Follow PEP 8 and run flake8 on CI & tox

Author: dahlia

.travis.yml

@@ -11,8 +11,9 @@ python:
 - 3.3
 - 3.4
 install:
-- pip install -e . "Werkzeug >= 0.9" coverage coveralls
+- pip install -e . "flake8 >= 2.4.0" "Werkzeug >= 0.9" coverage coveralls
 script:
 - coverage run --source sass,sassc,sassutils setup.py test
+- flake8 .
 after_success:
 - coveralls

sass.py

@@ -11,6 +11,7 @@
 
 """
 from __future__ import absolute_import
+
 import collections
 import inspect
 from io import open
@@ -432,7 +433,7 @@ def func_name(a, b):
     elif isinstance(custom_functions, (collections.Set, collections.Sequence)):
         custom_functions = [
             func if isinstance(func, SassFunction)
-                 else SassFunction.from_named_function(func)
+            else SassFunction.from_named_function(func)
             for func in custom_functions
         ]
     else:

sassc.py

@@ -87,8 +87,10 @@ def main(argv=sys.argv, stdout=sys.stdout, stderr=sys.stderr):
     parser.add_option('-w', '--watch', action='store_true',
                       help='Watch file for changes.  Requires the second '
                            'argument (output css filename).')
-    parser.add_option('-p', '--precision', action='store', type="int", default=5,
-                      help='Set the precision for numbers. [default: %default]')
+    parser.add_option(
+        '-p', '--precision', action='store', type='int', default=5,
+        help='Set the precision for numbers. [default: %default]'
+    )
     options, args = parser.parse_args(argv[1:])
     error = functools.partial(print,
                               parser.get_prog_name() + ': error:',

sasstests.py

@@ -58,7 +58,8 @@ def normalize_path(path):
     'sources': ['test/a.scss'],
     'sourcesContent': [],
     'names': [],
-    'mappings': ';AAKA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEJ,IAAI,CAAC,CAAC,CAAJ;IACA,KAAK,EAAE,IAAK,GADX',
+    'mappings': ';AAKA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;'
+                'EAEJ,IAAI,CAAC,CAAC,CAAJ;IACA,KAAK,EAAE,IAAK,GADX',
 }
 
 B_EXPECTED_CSS = '''\
@@ -458,7 +459,8 @@ def test_build_one(self):
                     'sources': ['../test/b.scss'],
                     'sourcesContent': [],
                     'names': [],
-                    'mappings': ';AACE,CAAC,CAAC,CAAC,CAAD;EACA,SAAS,EAAE,IAAK,GADf',
+                    'mappings': ';AACE,CAAC,CAAC,CAAC,CAAD;'
+                                'EACA,SAAS,EAAE,IAAK,GADf',
                 },
                 os.path.join(d, 'css', 'b.scss.css.map')
             )
@@ -476,7 +478,9 @@ def test_build_one(self):
                     'sources': ['../test/d.scss'],
                     'sourcesContent': [],
                     'names': [],
-                    'mappings': ';;AAKA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEJ,IAAI,CAAC,CAAC,CAAJ;IACA,IAAI,EAAE,0BAA2B,GADhC',
+                    'mappings': ';;AAKA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAGpB;'
+                                ';EAEJ,IAAI,CAAC,CAAC,CAAJ'
+                                ';IACA,IAAI,EAAE,0BAA2B,GADhC',
                 },
                 os.path.join(d, 'css', 'd.scss.css.map')
             )
@@ -582,7 +586,7 @@ def test_no_args(self):
         self.assertEqual(2, exit_code)
         err = self.err.getvalue()
         assert err.strip().endswith('error: too few arguments'), \
-               'actual error message is: ' + repr(err)
+            'actual error message is: ' + repr(err)
         self.assertEqual('', self.out.getvalue())
 
     def test_three_args(self):
@@ -593,7 +597,7 @@ def test_three_args(self):
         self.assertEqual(2, exit_code)
         err = self.err.getvalue()
         assert err.strip().endswith('error: too many arguments'), \
-               'actual error message is: ' + repr(err)
+            'actual error message is: ' + repr(err)
         self.assertEqual('', self.out.getvalue())
 
     def test_sassc_stdout(self):
@@ -640,7 +644,7 @@ def test_sassc_source_map_without_css_filename(self):
         assert err.strip().endswith('error: -m/-g/--sourcemap requires '
                                     'the second argument, the output css '
                                     'filename.'), \
-               'actual error message is: ' + repr(err)
+            'actual error message is: ' + repr(err)
         self.assertEqual('', self.out.getvalue())
 
     def test_sassc_sourcemap(self):
@@ -694,8 +698,10 @@ def test_successful(self):
             input_dir = os.path.join(tmpdir, 'input')
             output_dir = os.path.join(tmpdir, 'output')
             os.makedirs(os.path.join(input_dir, 'foo'))
-            write_file(os.path.join(input_dir, 'f1.scss'), 'a { b { width: 100%; } }')
-            write_file(os.path.join(input_dir, 'foo/f2.scss'), 'foo { width: 100%; }')
+            write_file(os.path.join(input_dir, 'f1.scss'),
+                       'a { b { width: 100%; } }')
+            write_file(os.path.join(input_dir, 'foo/f2.scss'),
+                       'foo { width: 100%; }')
             # Make sure we don't compile non-scss files
             write_file(os.path.join(input_dir, 'baz.txt'), 'Hello der')
 
@@ -744,7 +750,9 @@ def test_error(self):
             write_file(os.path.join(input_dir, 'bad.scss'), 'a {')
 
             try:
-                sass.compile(dirname=(input_dir, os.path.join(tmpdir, 'output')))
+                sass.compile(
+                    dirname=(input_dir, os.path.join(tmpdir, 'output'))
+                )
                 assert False, 'Expected to raise'
             except sass.CompileError as e:
                 msg, = e.args
@@ -753,7 +761,8 @@ def test_error(self):
                 ), msg
                 return
             except Exception as e:
-                assert False, 'Expected to raise CompileError but got {0!r}'.format(e)
+                assert False, \
+                    'Expected to raise CompileError but got {0!r}'.format(e)
 
 
 class SassFunctionTest(unittest.TestCase):
@@ -845,10 +854,6 @@ def test_sass_warning_no_conversion(self):
         warn = sass.SassWarning(u'error msg')
         assert type(warn.msg) is text_type, type(warn.msg)
 
-    def test_sass_warning_no_conversion(self):
-        warn = sass.SassWarning(b'error msg')
-        assert type(warn.msg) is text_type, type(warn.msg)
-
     def test_sass_error_no_conversion(self):
         err = sass.SassError(u'error msg')
         assert type(err.msg) is text_type, type(err.msg)
@@ -869,6 +874,7 @@ def returns_warning():
 def returns_error():
     return sass.SassError('This is an error')
 
+
 def returns_unknown():
     """Tuples are a not-supported type."""
     return 1, 2, 3
@@ -923,7 +929,7 @@ def identity(x):
     in C land
 
     """
-    import sys
+    import sys  # noqa
     return x
 
 

sassutils/wsgi.py

@@ -144,8 +144,9 @@ def __call__(self, environ, start_response):
                         b'body:before { content: ',
                         self.quote_css_string(str(e)).encode('utf-8'),
                         b'; color: maroon; background-color: white',
-                        b'; white-space: pre-wrap; display: block; ',
-                        b'font-family: "Courier New", monospace; user-select: text; }'
+                        b'; white-space: pre-wrap; display: block',
+                        b'; font-family: "Courier New", monospace'
+                        b'; user-select: text; }'
                     ]
 
                 def read_file(path):

setup.cfg

@@ -1,3 +1,6 @@
 [aliases]
 upload_doc = build_sphinx upload_doc
 release = sdist upload build_sphinx upload_doc
+
+[flake8]
+exclude = build,dist,docs,ez_setup.py

setup.py

@@ -5,7 +5,6 @@
 import distutils.cmd
 import distutils.log
 import distutils.sysconfig
-import glob
 import os
 import os.path
 import platform
@@ -94,7 +93,7 @@ def customize_compiler(compiler):
             flags.append('-mmacosx-version-min=10.7',)
             if tuple(map(int, platform.mac_ver()[0].split('.'))) >= (10, 9):
                 flags.append(
-                    '-Wno-error=unused-command-line-argument-hard-error-in-future',
+                    '-Wno-error=unused-command-line-argument-hard-error-in-future',  # noqa
                 )
         # Dirty workaround to avoid link error...
         # Python distutils doesn't provide any way to configure different
@@ -140,7 +139,10 @@ def restore_cencode():
 )
 
 install_requires = ['six']
-tests_require = ['Werkzeug >= 0.9']
+tests_require = [
+    'flake8 >= 2.4.0',
+    'Werkzeug >= 0.9'
+]
 
 
 def version(sass_filename='sass.py'):

tox.ini

@@ -2,7 +2,10 @@
 envlist = pypy, py26, py27, py33, py34
 
 [testenv]
-deps = Werkzeug >= 0.9
+deps =
+    flake8 >= 2.4.0
+    Werkzeug >= 0.9
 commands =
     python -c 'from shutil import *; rmtree("build", True)'
     python -m unittest sasstests
+    flake8 .

upload_appveyor_builds.py

@@ -10,7 +10,6 @@
 import shutil
 import subprocess
 
-from six import PY3
 from six.moves.urllib.parse import urljoin
 from six.moves.urllib.request import urlopen
 from twine.commands.upload import upload
@@ -84,8 +83,8 @@ def download_artifact(artifact, target_dir, overwrite=False):
     response = urlopen(artifact['url'])
     filename = os.path.basename(artifact['fileName'])
     target_path = os.path.join(target_dir, filename)
-    if (os.path.isfile(target_path) and
-        os.path.getsize(target_path) == artifact['size']):
+    if os.path.isfile(target_path) and \
+       os.path.getsize(target_path) == artifact['size']:
         if overwrite:
             print(artifact['fileName'], ' already exists; overwrite...')
         else: