Fixed several PEP8 errors

* E309 expected 1 blank line after class declaration
* E128 continuation line under-indented for visual indent
* E265 block comment should start with "# "
* E306 expected 1 blank line before a nested definition, found 0

docs/conf.py

@@ -27,7 +27,7 @@ sys.path.append(os.path.dirname(__file__))
 # -- 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.
@@ -52,7 +52,7 @@ templates_path = ['_templates']
 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'
@@ -78,34 +78,34 @@ version = '.'.join(release.split('.')[:2])
 
 # 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
 
 # A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# modindex_common_prefix = []
 
 
 # -- Options for HTML output ---------------------------------------------------
@@ -124,14 +124,14 @@ exclude_patterns = ['_build']
 
 # 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.  Do not set, template magic!
-#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
@@ -145,11 +145,11 @@ 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 = {
@@ -169,33 +169,33 @@ 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_use_modindex = False
 
 # 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 = False
 
 # 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 = ''
 
 # If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = ''
+# html_file_suffix = ''
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'Flaskdoc'
@@ -206,11 +206,12 @@ htmlhelp_basename = 'Flaskdoc'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('latexindex', 'Flask.tex', u'Flask Documentation', u'Armin Ronacher', 'manual'),
+  ('latexindex', 'Flask.tex', u'Flask Documentation', u'Armin Ronacher',
+   'manual'),
 ]
 
 # Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# latex_appendices = []
 
 # If false, no module index is generated.
 latex_use_modindex = False
@@ -229,38 +230,38 @@ latex_additional_files = ['flaskstyle.sty', 'logo.pdf']
 # -- Options for Epub output ---------------------------------------------------
 
 # Bibliographic Dublin Core info.
-#epub_title = ''
-#epub_author = ''
-#epub_publisher = ''
-#epub_copyright = ''
+# epub_title = ''
+# epub_author = ''
+# epub_publisher = ''
+# epub_copyright = ''
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.
-#epub_language = ''
+# epub_language = ''
 
 # The scheme of the identifier. Typical schemes are ISBN or URL.
-#epub_scheme = ''
+# epub_scheme = ''
 
 # The unique identifier of the text. This can be an ISBN number
 # or the project homepage.
-#epub_identifier = ''
+# epub_identifier = ''
 
 # A unique identification for the text.
-#epub_uid = ''
+# epub_uid = ''
 
 # HTML files that should be inserted before the pages created by sphinx.
 # The format is a list of tuples containing the path and title.
-#epub_pre_files = []
+# epub_pre_files = []
 
 # HTML files shat should be inserted after the pages created by sphinx.
 # The format is a list of tuples containing the path and title.
-#epub_post_files = []
+# epub_post_files = []
 
 # A list of files that should not be packed into the epub file.
-#epub_exclude_files = []
+# epub_exclude_files = []
 
 # The depth of the table of contents in toc.ncx.
-#epub_tocdepth = 3
+# epub_tocdepth = 3
 
 intersphinx_mapping = {
     'python': ('https://docs.python.org/3/', None),
@@ -276,22 +277,26 @@ html_theme_options = {
     'touch_icon': 'touch-icon.png'
 }
 
+
 # unwrap decorators
 def unwrap_decorators():
     import sphinx.util.inspect as inspect
     import functools
 
     old_getargspec = inspect.getargspec
+
     def getargspec(x):
         return old_getargspec(getattr(x, '_original_function', x))
     inspect.getargspec = getargspec
 
     old_update_wrapper = functools.update_wrapper
+
     def update_wrapper(wrapper, wrapped, *a, **kw):
         rv = old_update_wrapper(wrapper, wrapped, *a, **kw)
         rv._original_function = wrapped
         return rv
     functools.update_wrapper = update_wrapper
 
+
 unwrap_decorators()
 del unwrap_decorators

flask/app.py

@@ -54,6 +54,7 @@ def setupmethod(f):
     """Wraps a method so that it performs a check in debug mode if the
     first request was already handled.
     """
+
     def wrapper_func(self, *args, **kwargs):
         if self.debug and self._got_first_request:
             raise AssertionError('A setup function was called after the '

flask/blueprints.py

@@ -177,7 +177,7 @@ class Blueprint(_PackageBoundObject):
         if endpoint:
             assert '.' not in endpoint, "Blueprint endpoints should not contain dots"
         self.record(lambda s:
-            s.add_url_rule(rule, endpoint, view_func, **options))
+                    s.add_url_rule(rule, endpoint, view_func, **options))
 
     def endpoint(self, endpoint):
         """Like :meth:`Flask.endpoint` but for a blueprint.  This does not
@@ -279,7 +279,7 @@ class Blueprint(_PackageBoundObject):
         that blueprint.
         """
         self.record_once(lambda s: s.app.before_request_funcs
-            .setdefault(self.name, []).append(f))
+                         .setdefault(self.name, []).append(f))
         return f
 
     def before_app_request(self, f):
@@ -287,7 +287,7 @@ class Blueprint(_PackageBoundObject):
         before each request, even if outside of a blueprint.
         """
         self.record_once(lambda s: s.app.before_request_funcs
-            .setdefault(None, []).append(f))
+                         .setdefault(None, []).append(f))
         return f
 
     def before_app_first_request(self, f):
@@ -303,7 +303,7 @@ class Blueprint(_PackageBoundObject):
         that blueprint.
         """
         self.record_once(lambda s: s.app.after_request_funcs
-            .setdefault(self.name, []).append(f))
+                         .setdefault(self.name, []).append(f))
         return f
 
     def after_app_request(self, f):
@@ -311,7 +311,7 @@ class Blueprint(_PackageBoundObject):
         is executed after each request, even if outside of the blueprint.
         """
         self.record_once(lambda s: s.app.after_request_funcs
-            .setdefault(None, []).append(f))
+                         .setdefault(None, []).append(f))
         return f
 
     def teardown_request(self, f):
@@ -322,7 +322,7 @@ class Blueprint(_PackageBoundObject):
         performed.
         """
         self.record_once(lambda s: s.app.teardown_request_funcs
-            .setdefault(self.name, []).append(f))
+                         .setdefault(self.name, []).append(f))
         return f
 
     def teardown_app_request(self, f):
@@ -331,7 +331,7 @@ class Blueprint(_PackageBoundObject):
         the blueprint.
         """
         self.record_once(lambda s: s.app.teardown_request_funcs
-            .setdefault(None, []).append(f))
+                         .setdefault(None, []).append(f))
         return f
 
     def context_processor(self, f):
@@ -339,7 +339,7 @@ class Blueprint(_PackageBoundObject):
         function is only executed for requests handled by a blueprint.
         """
         self.record_once(lambda s: s.app.template_context_processors
-            .setdefault(self.name, []).append(f))
+                         .setdefault(self.name, []).append(f))
         return f
 
     def app_context_processor(self, f):
@@ -347,7 +347,7 @@ class Blueprint(_PackageBoundObject):
         function is executed each request, even if outside of the blueprint.
         """
         self.record_once(lambda s: s.app.template_context_processors
-            .setdefault(None, []).append(f))
+                         .setdefault(None, []).append(f))
         return f
 
     def app_errorhandler(self, code):
@@ -365,7 +365,7 @@ class Blueprint(_PackageBoundObject):
         can modify the url values provided.
         """
         self.record_once(lambda s: s.app.url_value_preprocessors
-            .setdefault(self.name, []).append(f))
+                         .setdefault(self.name, []).append(f))
         return f
 
     def url_defaults(self, f):
@@ -374,21 +374,21 @@ class Blueprint(_PackageBoundObject):
         in place.
         """
         self.record_once(lambda s: s.app.url_default_functions
-            .setdefault(self.name, []).append(f))
+                         .setdefault(self.name, []).append(f))
         return f
 
     def app_url_value_preprocessor(self, f):
         """Same as :meth:`url_value_preprocessor` but application wide.
         """
         self.record_once(lambda s: s.app.url_value_preprocessors
-            .setdefault(None, []).append(f))
+                         .setdefault(None, []).append(f))
         return f
 
     def app_url_defaults(self, f):
         """Same as :meth:`url_defaults` but application wide.
         """
         self.record_once(lambda s: s.app.url_default_functions
-            .setdefault(None, []).append(f))
+                         .setdefault(None, []).append(f))
         return f
 
     def errorhandler(self, code_or_exception):

flask/json/__init__.py

@@ -86,7 +86,7 @@ def _dump_arg_defaults(kwargs):
         kwargs.setdefault(
             'cls',
             bp.json_encoder if bp and bp.json_encoder
-                else current_app.json_encoder
+            else current_app.json_encoder
         )
 
         if not current_app.config['JSON_AS_ASCII']:
@@ -105,7 +105,7 @@ def _load_arg_defaults(kwargs):
         kwargs.setdefault(
             'cls',
             bp.json_decoder if bp and bp.json_decoder
-                else current_app.json_decoder
+            else current_app.json_decoder
         )
     else:
         kwargs.setdefault('cls', JSONDecoder)

scripts/flask-07-upgrade.py

@@ -57,9 +57,11 @@ _blueprint_related = [
 
 def make_diff(filename, old, new):
     for line in difflib.unified_diff(old.splitlines(), new.splitlines(),
-                     posixpath.normpath(posixpath.join('a', filename)),
-                     posixpath.normpath(posixpath.join('b', filename)),
-                     lineterm=''):
+                                     posixpath.normpath(
+                                         posixpath.join('a', filename)),
+                                     posixpath.normpath(
+                                         posixpath.join('b', filename)),
+                                     lineterm=''):
         print(line)
 
 

tests/test_helpers.py

@@ -22,7 +22,7 @@ from werkzeug.exceptions import BadRequest, NotFound
 from werkzeug.http import parse_cache_control_header, parse_options_header
 from werkzeug.http import http_date
 from flask._compat import StringIO, text_type
-from flask.helpers import get_debug_flag, make_response
+from flask.helpers import get_debug_flag
 
 
 def has_encoding(name):
@@ -35,6 +35,7 @@ def has_encoding(name):
 
 
 class TestJSON(object):
+
     def test_ignore_cached_json(self, app):
         with app.test_request_context('/', method='POST', data='malformed',
                                       content_type='application/json'):
@@ -916,6 +917,7 @@ class TestSafeJoin(object):
             with pytest.raises(NotFound):
                 print(flask.safe_join(*args))
 
+
 class TestHelpers(object):
 
     @pytest.mark.parametrize('debug, expected_flag, expected_default_flag', [