Merge pull request pallets-eco#1427 from pawl/add_flake8

Add flake8 to tests

Author: mrjoes

flask_admin/__init__.py

@@ -3,4 +3,4 @@
 __email__ = '[email protected]'
 
 
-from .base import expose, expose_plugview, Admin, BaseView, AdminIndexView
+from .base import expose, expose_plugview, Admin, BaseView, AdminIndexView  # noqa: F401

flask_admin/_compat.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
 """
     flask_admin._compat
     ~~~~~~~~~~~~~~~~~~~~~~~

flask_admin/base.py

@@ -9,7 +9,7 @@
 from flask_admin import helpers as h
 
 # For compatibility reasons import MenuLink
-from flask_admin.menu import MenuCategory, MenuView, MenuLink
+from flask_admin.menu import MenuCategory, MenuView, MenuLink  # noqa: F401
 
 
 def expose(url='/', methods=('GET',)):
@@ -670,7 +670,6 @@ def init_app(self, app, index_view=None,
         for view in self._views:
             app.register_blueprint(view.create_blueprint(self))
 
-
     def _init_extension(self):
         if not hasattr(self.app, 'extensions'):
             self.app.extensions = dict()
@@ -699,4 +698,4 @@ def menu_links(self):
         """
             Return menu links.
         """
-        return self._menu_links
+        return self._menu_links

flask_admin/contrib/appengine/__init__.py

@@ -1,3 +1,4 @@
+# flake8: noqa
 try:
     import wtforms_appengine
 except ImportError:

flask_admin/contrib/appengine/fields.py

@@ -3,6 +3,7 @@
 
 import decimal
 
+
 class GeoPtPropertyField(StringField):
     def process_formdata(self, valuelist):
         if valuelist:

flask_admin/contrib/appengine/form.py

@@ -2,6 +2,7 @@
 from .fields import GeoPtPropertyField
 from flask_admin.model.form import converts
 
+
 class AdminModelConverter(ModelConverter):
     @converts('GeoPt')
     def convert_GeoPtProperty(self, model, prop, kwargs):

flask_admin/contrib/appengine/view.py

@@ -11,6 +11,7 @@
 from flask_admin.model.form import create_editable_list_form
 from .form import AdminModelConverter
 
+
 class NdbModelView(BaseModelView):
     """
     AppEngine NDB model scaffolding.
@@ -32,7 +33,7 @@ def is_valid_filter(self):
         pass
 
     def scaffold_filters(self):
-        #TODO: implement
+        # TODO: implement
         pass
 
     form_args = None
@@ -75,7 +76,7 @@ def scaffold_list_form(self, widget=None, validators=None):
 
     def get_list(self, page, sort_field, sort_desc, search, filters,
                  page_size=None):
-        #TODO: implement filters (don't think search can work here)
+        # TODO: implement filters (don't think search can work here)
 
         q = self.model.query()
 
@@ -88,7 +89,7 @@ def get_list(self, page, sort_field, sort_desc, search, filters,
         if not page_size:
             page_size = self.page_size
 
-        results = q.fetch(page_size, offset=page*page_size)
+        results = q.fetch(page_size, offset=page * page_size)
 
         return q.count(), results
 
@@ -102,7 +103,7 @@ def create_model(self, form):
             model.put()
         except Exception as ex:
             if not self.handle_view_exception(ex):
-                #flash(gettext('Failed to create record. %(error)s',
+                # flash(gettext('Failed to create record. %(error)s',
                 #    error=ex), 'error')
                 logging.exception('Failed to create record.')
             return False
@@ -117,7 +118,7 @@ def update_model(self, form, model):
             model.put()
         except Exception as ex:
             if not self.handle_view_exception(ex):
-                #flash(gettext('Failed to update record. %(error)s',
+                # flash(gettext('Failed to update record. %(error)s',
                 #    error=ex), 'error')
                 logging.exception('Failed to update record.')
             return False
@@ -126,19 +127,19 @@ def update_model(self, form, model):
 
         return True
 
-    def delete_model(self,  model):
+    def delete_model(self, model):
         try:
             model.key.delete()
         except Exception as ex:
             if not self.handle_view_exception(ex):
-                #flash(gettext('Failed to delete record. %(error)s',
+                # flash(gettext('Failed to delete record. %(error)s',
                 #    error=ex),
                 #    'error')
                 logging.exception('Failed to delete record.')
             return False
         else:
             self.after_model_delete(model)
-        
+
         return True
 
 
@@ -155,7 +156,8 @@ def scaffold_list_columns(self):
 
     def scaffold_sortable_columns(self):
         # We use getattr() because ReferenceProperty does not specify a 'indexed' field
-        return [k for (k, v) in self.model.__dict__.iteritems() if isinstance(v, db.Property) and getattr(v, 'indexed', None)]
+        return [k for (k, v) in self.model.__dict__.iteritems()
+                if isinstance(v, db.Property) and getattr(v, 'indexed', None)]
 
     def init_search(self):
         return None
@@ -164,14 +166,14 @@ def is_valid_filter(self):
         pass
 
     def scaffold_filters(self):
-        #TODO: implement
+        # TODO: implement
         pass
 
     def scaffold_form(self):
         return wt_db.model_form(self.model())
 
     def get_list(self, page, sort_field, sort_desc, search, filters):
-        #TODO: implement filters (don't think search can work here)
+        # TODO: implement filters (don't think search can work here)
 
         q = self.model.all()
 
@@ -180,7 +182,7 @@ def get_list(self, page, sort_field, sort_desc, search, filters):
                 sort_field = "-" + sort_field
             q.order(sort_field)
 
-        results = q.fetch(self.page_size, offset=page*self.page_size)
+        results = q.fetch(self.page_size, offset=page * self.page_size)
         return q.count(), results
 
     def get_one(self, encoded_key):
@@ -194,7 +196,7 @@ def create_model(self, form):
             return model
         except Exception as ex:
             if not self.handle_view_exception(ex):
-                #flash(gettext('Failed to create record. %(error)s',
+                # flash(gettext('Failed to create record. %(error)s',
                 #    error=ex), 'error')
                 logging.exception('Failed to create record.')
             return False
@@ -206,23 +208,24 @@ def update_model(self, form, model):
             return True
         except Exception as ex:
             if not self.handle_view_exception(ex):
-                #flash(gettext('Failed to update record. %(error)s',
+                # flash(gettext('Failed to update record. %(error)s',
                 #    error=ex), 'error')
                 logging.exception('Failed to update record.')
             return False
 
-    def delete_model(self,  model):
+    def delete_model(self, model):
         try:
             model.delete()
             return True
         except Exception as ex:
             if not self.handle_view_exception(ex):
-                #flash(gettext('Failed to delete record. %(error)s',
+                # flash(gettext('Failed to delete record. %(error)s',
                 #    error=ex),
                 #    'error')
                 logging.exception('Failed to delete record.')
         return False
 
+
 def ModelView(model):
     if issubclass(model, ndb.Model):
         return NdbModelView(model)

flask_admin/contrib/fileadmin/__init__.py

@@ -300,12 +300,12 @@ def __init__(self, base_url=None, name=None, category=None, endpoint=None,
 
         # Convert allowed_extensions to set for quick validation
         if (self.allowed_extensions and
-            not isinstance(self.allowed_extensions, set)):
+                not isinstance(self.allowed_extensions, set)):
             self.allowed_extensions = set(self.allowed_extensions)
 
         # Convert editable_extensions to set for quick validation
         if (self.editable_extensions and
-            not isinstance(self.editable_extensions, set)):
+                not isinstance(self.editable_extensions, set)):
             self.editable_extensions = set(self.editable_extensions)
 
         super(BaseFileAdmin, self).__init__(name, category, endpoint, url,
@@ -436,7 +436,7 @@ def upload_form(self):
         if request.form:
             # Workaround for allowing both CSRF token + FileField to be submitted
             # https://bitbucket.org/danjac/flask-wtf/issue/12/fieldlist-filefield-does-not-follow
-            formdata = request.form.copy() # as request.form is immutable
+            formdata = request.form.copy()  # as request.form is immutable
             formdata.update(request.files)
 
             # admin=self allows the form to use self.is_file_allowed
@@ -827,7 +827,7 @@ def index_view(self, path=None):
             # Sort by type
             items.sort(key=itemgetter(2), reverse=True)
             # Sort by modified date
-            items.sort(key=lambda values: (values[0], values[1], values[2], values[3], datetime.fromtimestamp(values[4])), reverse=True)
+            items.sort(key=lambda x: (x[0], x[1], x[2], x[3], datetime.fromtimestamp(x[4])), reverse=True)
         else:
             column_index = self.possible_columns.index(sort_column)
             items.sort(key=itemgetter(column_index), reverse=sort_desc)

flask_admin/contrib/fileadmin/s3.py

@@ -55,10 +55,11 @@ def __init__(self, bucket_name, region, aws_access_key_id,
             raise ValueError('Could not import boto. You can install boto by '
                              'using pip install boto')
 
-        connection = s3.connect_to_region(region,
-                                          aws_access_key_id=aws_access_key_id,
-                                          aws_secret_access_key=
-                                          aws_secret_access_key)
+        connection = s3.connect_to_region(
+            region,
+            aws_access_key_id=aws_access_key_id,
+            aws_secret_access_key=aws_secret_access_key,
+        )
         self.bucket = connection.get_bucket(bucket_name)
         self.separator = '/'
 

flask_admin/contrib/geoa/__init__.py

@@ -1,3 +1,4 @@
+# flake8: noqa
 try:
     import geoalchemy2
     import shapely

flask_admin/contrib/geoa/widgets.py

@@ -38,9 +38,9 @@ def __call__(self, field, **kwargs):
         kwargs.setdefault('data-geometry-type', gtype)
 
         # set optional values from constructor
-        if not "data-width" in kwargs:
+        if "data-width" not in kwargs:
             kwargs["data-width"] = self.width
-        if not "data-height" in kwargs:
+        if "data-height" not in kwargs:
             kwargs["data-height"] = self.height
         if self.center:
             kwargs["data-lat"] = lat(self.center)

flask_admin/contrib/mongoengine/__init__.py

@@ -1,3 +1,4 @@
+# flake8: noqa
 try:
     import flask_mongoengine
 except ImportError:

flask_admin/contrib/mongoengine/form.py

@@ -7,7 +7,6 @@
 from flask_admin import form
 from flask_admin.model.form import FieldPlaceholder
 from flask_admin.model.fields import InlineFieldList, AjaxSelectField, AjaxSelectMultipleField
-from flask_admin.model.widgets import InlineFormWidget
 from flask_admin._compat import iteritems
 
 from .fields import ModelFormField, MongoFileField, MongoImageField

flask_admin/contrib/mongoengine/subdoc.py

@@ -18,6 +18,7 @@ def convert_subdocuments(values):
         elif isinstance(p, EmbeddedForm):
             result[name] = p
         else:
-            raise ValueError('Invalid subdocument type: expecting dict or instance of flask_admin.contrib.mongoengine.EmbeddedForm, got %s' % type(p))
+            raise ValueError('Invalid subdocument type: expecting dict or '
+                             'instance of flask_admin.contrib.mongoengine.EmbeddedForm, got %s' % type(p))
 
     return result

flask_admin/contrib/mongoengine/tools.py

@@ -2,7 +2,7 @@ def parse_like_term(term):
     """
         Parse search term into (operation, term) tuple. Recognizes operators
         in the beginning of the search term.
-        
+
         * = case insensitive (can precede other operators)
         ^ = starts with
         = = exact
@@ -24,5 +24,5 @@ def parse_like_term(term):
         oper = 'contains'
     # add case insensitive flag
     if case_insensitive:
-        oper = 'i'+oper
+        oper = 'i' + oper
     return oper, term

flask_admin/contrib/mongoengine/view.py

@@ -323,7 +323,7 @@ def scaffold_list_columns(self):
             field_class = type(f)
 
             if (field_class == mongoengine.ListField and
-                isinstance(f.field, mongoengine.EmbeddedDocumentField)):
+                    isinstance(f.field, mongoengine.EmbeddedDocumentField)):
                 continue
 
             if field_class == mongoengine.EmbeddedDocumentField:
@@ -626,7 +626,6 @@ def delete_model(self, model):
 
         return True
 
-
     # FileField access API
     @expose('/api/file/')
     def api_file_view(self):
@@ -645,9 +644,7 @@ def api_file_view(self):
 
         return Response(data.read(),
                         content_type=data.content_type,
-                        headers={
-                            'Content-Length': data.length
-                        })
+                        headers={'Content-Length': data.length})
 
     # Default model actions
     def is_action_allowed(self, name):

flask_admin/contrib/peewee/__init__.py

@@ -1,3 +1,4 @@
+# flake8: noqa
 try:
     import peewee
     import wtfpeewee

flask_admin/contrib/peewee/form.py

@@ -36,15 +36,22 @@ def __init__(self, form, model, prop, inline_view, **kwargs):
     def display_row_controls(self, field):
         return field.get_pk() is not None
 
-    # *** bryhoyt removed def process() entirely, because I believe it was buggy
-    # (but worked because another part of the code had a complimentary bug)
-    # and I'm not sure why it was necessary anyway.
-    # If we want it back in, we need to fix the following bogus query:
-    # self.model.select().where(attr == data).execute()     # `data` is not an ID, and only happened to be so because we patched it in in .contribute() below
-    #
-    # For reference:
-    # .process() introduced in https://github.com/flask-admin/flask-admin/commit/2845e4b28cb40b25e2bf544b327f6202dc7e5709
-    # Fixed, brokenly I think, in https://github.com/flask-admin/flask-admin/commit/4383eef3ce7eb01878f086928f8773adb9de79f8#diff-f87e7cd76fb9bc48c8681b24f238fb13R30
+    """ bryhoyt removed def process() entirely, because I believe it was buggy
+        (but worked because another part of the code had a complimentary bug)
+        and I'm not sure why it was necessary anyway.
+
+        If we want it back in, we need to fix the following bogus query:
+        self.model.select().where(attr == data).execute()
+
+        `data` is not an ID, and only happened to be so because we patched it
+        in in .contribute() below
+
+        For reference, .process() introduced in:
+        https://github.com/flask-admin/flask-admin/commit/2845e4b28cb40b25e2bf544b327f6202dc7e5709
+
+        Fixed, brokenly I think, in:
+        https://github.com/flask-admin/flask-admin/commit/4383eef3ce7eb01878f086928f8773adb9de79f8#diff-f87e7cd76fb9bc48c8681b24f238fb13R30
+    """
 
     def populate_obj(self, obj, name):
         pass
@@ -246,7 +253,6 @@ def contribute(self, converter, model, form_class, inline_model):
                                     allow_pk=True,
                                     converter=converter)
 
-
         prop_name = reverse_field.related_name
 
         label = self.get_label(info, prop_name)

flask_admin/contrib/peeweemodel/__init__.py

@@ -1,11 +1,13 @@
 def setup():
     import warnings
-    warnings.warn('Flask-Admin peewee integration module was renamed as flask_admin.contrib.peewee, please use it instead.')
+    warnings.warn('Flask-Admin peewee integration module was renamed as '
+                  'flask_admin.contrib.peewee, please use it instead.')
 
     from flask_admin._backwards import import_redirect
     import_redirect(__name__, 'flask_admin.contrib.peewee')
 
+
 setup()
 del setup
 
-from ..peewee.view import ModelView
+from ..peewee.view import ModelView  # noqa: F401