Fix issues raised by flake8 (#779)

Author: peymanslh

.flake8

@@ -1 +1,6 @@
+[flake8]
 max-line-length = 88
+exclude =
+    .tox
+    node_modules
+    *env/

docs/conf.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Pipeline documentation build configuration file, created by
 # sphinx-quickstart on Sat Apr 30 17:47:55 2011.
 #
@@ -15,12 +13,12 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+# sys.path.insert(0, os.path.abspath('.'))
 
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+# needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
@@ -33,7 +31,7 @@
 source_suffix = '.rst'
 
 # The encoding of source files.
-#source_encoding = 'utf-8-sig'
+# source_encoding = 'utf-8-sig'
 
 # The master toctree document.
 master_doc = 'index'
@@ -53,37 +51,37 @@
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-#language = None
+# language = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+# today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = ['_build']
 
 # The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
+# default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-#add_module_names = True
+# add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+# show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# modindex_common_prefix = []
 
 
 # -- Options for HTML output ---------------------------------------------------
@@ -95,72 +93,72 @@
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+# html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+# html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+# html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+# html_short_title = None
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+# html_logo = None
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+# html_favicon = None
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
+# html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+# html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+# html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {}
+# html_additional_pages = {}
 
 # If false, no module index is generated.
-#html_domain_indices = True
+# html_domain_indices = True
 
 # If false, no index is generated.
-#html_use_index = True
+# html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
-#html_split_index = False
+# html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+# html_show_sourcelink = True
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+# html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+# html_show_copyright = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# html_use_opensearch = ''
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
+# html_file_suffix = None
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'django-pipelinedoc'
@@ -169,10 +167,10 @@
 # -- Options for LaTeX output --------------------------------------------------
 
 # The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
+# latex_paper_size = 'letter'
 
 # The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
+# latex_font_size = '10pt'
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
@@ -183,26 +181,26 @@
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+# latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-#latex_use_parts = False
+# latex_use_parts = False
 
 # If true, show page references after internal links.
-#latex_show_pagerefs = False
+# latex_show_pagerefs = False
 
 # If true, show URL addresses after external links.
-#latex_show_urls = False
+# latex_show_urls = False
 
 # Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
+# latex_preamble = ''
 
 # Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# latex_appendices = []
 
 # If false, no module index is generated.
-#latex_domain_indices = True
+# latex_domain_indices = True
 
 
 # -- Options for manual page output --------------------------------------------

pipeline/collector.py

@@ -46,7 +46,7 @@ def collect(self, request=None, files=[]):
                     prefixed_path = path
 
                 if (prefixed_path not in found_files and
-                    (not files or prefixed_path in files)):
+                   (not files or prefixed_path in files)):
                     found_files[prefixed_path] = (storage, path)
                     self.copy_file(path, prefixed_path, storage)
 
@@ -67,7 +67,10 @@ def delete_file(self, path, prefixed_path, source_storage):
         if self.storage.exists(prefixed_path):
             try:
                 # When was the target file modified last time?
-                target_last_modified = self._get_modified_time(self.storage, prefixed_path)
+                target_last_modified = self._get_modified_time(
+                    self.storage,
+                    prefixed_path,
+                )
             except (OSError, NotImplementedError, AttributeError):
                 # The storage doesn't support ``modified_time`` or failed
                 pass
@@ -82,9 +85,10 @@ def delete_file(self, path, prefixed_path, source_storage):
                     # Avoid sub-second precision
                     if (target_last_modified.replace(microsecond=0)
                             >= source_last_modified.replace(microsecond=0)):
-                            return False
+                        return False
             # Then delete the existing file if really needed
             self.storage.delete(prefixed_path)
         return True
 
+
 default_collector = Collector()

pipeline/compilers/__init__.py

@@ -50,7 +50,9 @@ def _compile(input_path):
         except ImportError:
             return list(map(_compile, paths))
         else:
-            with futures.ThreadPoolExecutor(max_workers=multiprocessing.cpu_count()) as executor:
+            with futures.ThreadPoolExecutor(
+                max_workers=multiprocessing.cpu_count()
+            ) as executor:
                 return list(executor.map(_compile, paths))
 
 
@@ -112,14 +114,19 @@ def execute_command(self, command, cwd=None, stdout_captured=None):
             else:
                 argument_list.extend(flattening_arg)
 
-        # The first element in argument_list is the program that will be executed; if it is '', then
-        # a PermissionError will be raised. Thus empty arguments are filtered out from argument_list
+        # The first element in argument_list is the program that will be
+        # executed; if it is '', then a PermissionError will be raised.
+        # Thus empty arguments are filtered out from argument_list
         argument_list = list(filter(None, argument_list))
         stdout = None
         try:
             # We always catch stdout in a file, but we may not have a use for it.
-            temp_file_container = cwd or os.path.dirname(stdout_captured or "") or os.getcwd()
-            with NamedTemporaryFile('wb', delete=False, dir=temp_file_container) as stdout:
+            temp_file_container = (
+                cwd or os.path.dirname(stdout_captured or "") or os.getcwd()
+            )
+            with NamedTemporaryFile(
+                'wb', delete=False, dir=temp_file_container
+            ) as stdout:
                 compiling = subprocess.Popen(argument_list,
                                              cwd=cwd,
                                              stdout=stdout,
@@ -147,6 +154,8 @@ def execute_command(self, command, cwd=None, stdout_captured=None):
             # Decide what to do with captured stdout.
             if stdout:
                 if stdout_captured:
-                    shutil.move(stdout.name, os.path.join(cwd or os.curdir, stdout_captured))
+                    shutil.move(
+                        stdout.name, os.path.join(cwd or os.curdir, stdout_captured)
+                    )
                 else:
                     os.remove(stdout.name)

pipeline/compilers/less.py

@@ -17,4 +17,6 @@ def compile_file(self, infile, outfile, outdated=False, force=False):
             settings.LESS_ARGUMENTS,
             infile,
         )
-        return self.execute_command(command, cwd=dirname(infile), stdout_captured=outfile)
+        return self.execute_command(
+            command, cwd=dirname(infile), stdout_captured=outfile
+        )

pipeline/compressors/__init__.py

@@ -17,7 +17,7 @@
 NON_REWRITABLE_URL = re.compile(r'^(#|http:|https:|data:|//)')
 
 DEFAULT_TEMPLATE_FUNC = "template"
-TEMPLATE_FUNC = r"""var template = function(str){var fn = new Function('obj', 'var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push(\''+str.replace(/\\/g, '\\\\').replace(/'/g, "\\'").replace(/<%=([\s\S]+?)%>/g,function(match,code){return "',"+code.replace(/\\'/g, "'")+",'";}).replace(/<%([\s\S]+?)%>/g,function(match,code){return "');"+code.replace(/\\'/g, "'").replace(/[\r\n\t]/g,' ')+"__p.push('";}).replace(/\r/g,'\\r').replace(/\n/g,'\\n').replace(/\t/g,'\\t')+"');}return __p.join('');");return fn;};"""
+TEMPLATE_FUNC = r"""var template = function(str){var fn = new Function('obj', 'var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push(\''+str.replace(/\\/g, '\\\\').replace(/'/g, "\\'").replace(/<%=([\s\S]+?)%>/g,function(match,code){return "',"+code.replace(/\\'/g, "'")+",'";}).replace(/<%([\s\S]+?)%>/g,function(match,code){return "');"+code.replace(/\\'/g, "'").replace(/[\r\n\t]/g,' ')+"__p.push('";}).replace(/\r/g,'\\r').replace(/\n/g,'\\n').replace(/\t/g,'\\t')+"');}return __p.join('');");return fn;};""" # noqa
 
 MIME_TYPES = {
     '.png': 'image/png',
@@ -96,7 +96,10 @@ def compile_templates(self, paths):
                 settings.TEMPLATE_FUNC,
                 contents
             ))
-        compiler = TEMPLATE_FUNC if settings.TEMPLATE_FUNC == DEFAULT_TEMPLATE_FUNC else ""
+        if settings.TEMPLATE_FUNC == DEFAULT_TEMPLATE_FUNC:
+            compiler = TEMPLATE_FUNC
+        else:
+            compiler = ""
         return "\n".join([
             "%(namespace)s = %(namespace)s || {};" % {'namespace': namespace},
             compiler,
@@ -148,7 +151,10 @@ def concatenate(self, paths):
 
     def construct_asset_path(self, asset_path, css_path, output_filename, variant=None):
         """Return a rewritten asset URL for a stylesheet"""
-        public_path = self.absolute_path(asset_path, os.path.dirname(css_path).replace('\\', '/'))
+        public_path = self.absolute_path(
+            asset_path,
+            os.path.dirname(css_path).replace('\\', '/'),
+        )
         if self.embeddable(public_path, variant):
             return "__EMBED__%s" % public_path
         if not posixpath.isabs(asset_path):
@@ -161,11 +167,13 @@ def embeddable(self, path, variant):
         font = ext in FONT_EXTS
         if not variant:
             return False
-        if not (re.search(settings.EMBED_PATH, path.replace('\\', '/')) and self.storage.exists(path)):
+        if not (re.search(settings.EMBED_PATH, path.replace('\\', '/'))
+                and self.storage.exists(path)):
             return False
         if ext not in EMBED_EXTS:
             return False
-        if not (font or len(self.encoded_content(path)) < settings.EMBED_MAX_IMAGE_SIZE):
+        if not (font or
+                len(self.encoded_content(path)) < settings.EMBED_MAX_IMAGE_SIZE):
             return False
         return True
 
@@ -204,7 +212,8 @@ def absolute_path(self, path, start):
     def relative_path(self, absolute_path, output_filename):
         """Rewrite paths relative to the output stylesheet path"""
         absolute_path = posixpath.join(settings.PIPELINE_ROOT, absolute_path)
-        output_path = posixpath.join(settings.PIPELINE_ROOT, posixpath.dirname(output_filename))
+        output_path = posixpath.join(
+            settings.PIPELINE_ROOT, posixpath.dirname(output_filename))
         return relpath(absolute_path, output_path)
 
     def read_bytes(self, path):

pipeline/conf.py

@@ -47,7 +47,7 @@
 
     'UGLIFYJS_BINARY': '/usr/bin/env uglifyjs',
     'UGLIFYJS_ARGUMENTS': '',
-    
+
     'TERSER_BINARY': '/usr/bin/env terser',
     'TERSER_ARGUMENTS': '--compress',
 

pipeline/forms.py

@@ -214,8 +214,7 @@ def _get_media_files(cls, packager, media_packages, media_type,
         """
         source_files = list(extra_files)
 
-        if (not settings.PIPELINE_ENABLED and
-            settings.PIPELINE_COLLECTOR_ENABLED):
+        if (not settings.PIPELINE_ENABLED and settings.PIPELINE_COLLECTOR_ENABLED):
             default_collector.collect()
 
         for media_package in media_packages: