Fix flake8 linting

Author: hugovk

app/__init__.py

@@ -7,9 +7,9 @@
 
 try:
     assert version_info >= (3, 7, 0)
-except AssertionError as e:
-    print('Warning Current python version not supported')
-    print('Current python version: {version}'.format(version=version_info))
+except AssertionError:
+    print('Warning Current Python version not supported')
+    print('Current Python version: {version}'.format(version=version_info))
     exit(1)
 
 

app/api/__init__.py

@@ -1,4 +1,3 @@
-from app.api import routes
 from flask import Blueprint
 
 bp = Blueprint('api', __name__)

app/api/routes.py

@@ -25,7 +25,8 @@ def get_resources():
         print(e)
 
     finally:
-        return jsonify([single_resource.serialize for single_resource in resources])
+        return jsonify([single_resource.serialize for
+                        single_resource in resources])
 
 
 def get_languages():

app/cli.py

@@ -27,19 +27,23 @@ def import_resources(db):
         category_dict = {c.key(): c for c in categories_list}
     except AttributeError as e:
         print('-------> EXCEPTION OCCURED DURING DB SETUP')
-        print('-------> Most likely you need to set the "SQLALCHEMY_DATABASE_URI"')
+        print('-------> Most likely you need to set the '
+              '"SQLALCHEMY_DATABASE_URI"')
         print(f'-------> Exception message: {e}')
         return
 
     # Step 4: Create/Update each resource in the db_session
     for resource in unique_resources:
-        resource['category'] = get_category(resource, category_dict)  # Note: modifies the category_dict in place (bad?)
+        # Note: modifies the category_dict in place (bad?)
+        resource['category'] = get_category(resource, category_dict)
+        # Note: modifies the language_dict in place (bad?)
         resource['languages'] = get_languages(resource,
-                                              language_dict)  # Note: modifies the language_dict in place (bad?)
+                                              language_dict)
         existing_resource = existing_resources.get(resource['url'])
 
         if existing_resource:
-            resource == existing_resource or update_resource(resource, existing_resource)
+            resource == existing_resource or \
+                        update_resource(resource, existing_resource)
         else:
             create_resource(resource, db)
 
@@ -48,12 +52,10 @@ def import_resources(db):
     except exc.SQLAlchemyError as e:
         db.session.rollback()
         print('Flask SQLAlchemy Exception:', e)
-        template = "An SQLAlchemy exception of type {0} occurred. Arguments:\n{1!r}"
         print(resource)
     except Exception as e:
         db.session.rollback()
         print('exception', e)
-        template = "An exception of type {0} occurred. Arguments:\n{1!r}"
         print(resource)
 
 
@@ -65,7 +67,8 @@ def remove_duplicates(data):
             resource_dict[resource['url']] = True
             unique_resources.append(resource)
         else:
-            print(f"Encountered a duplicate resource in resources.yml: {resource['url']}")
+            print(f"Encountered a duplicate resource "
+                  f"in resources.yml: {resource['url']}")
     return unique_resources
 
 
@@ -127,7 +130,6 @@ def db_migrate():
         """ migration commands"""
         pass
 
-
     @db_migrate.command()
     def init():
         print(db)

app/health_check.py

@@ -5,5 +5,5 @@ def health_database_status():
     try:
         db.session.query("1").from_statement("SELECT 1").all()
         return '<h1>It works.</h1>'
-    except:
+    except Exception:
         return '<h1>Something is broken.</h1>'

app/models.py

@@ -2,24 +2,37 @@
 from sqlalchemy_utils import URLType
 
 '''
-    event_id = db.Column('event_id', db.Integer, db.ForeignKey('event.id'), nullable=False)
+    event_id = db.Column('event_id',
+                         db.Integer,
+                         db.ForeignKey('event.id'),
+                         nullable=False)
     event = db.relationship('Event')
-    partner_id = db.Column('partner_id', db.Integer, db.ForeignKey('partner.id'))
+    partner_id = db.Column('partner_id',
+                           db.Integer,
+                           db.ForeignKey('partner.id'))
     partner = db.relationship('Partner')
 
 '''
 
 language_identifier = db.Table('language_identifier',
-                               db.Column('resource_id', db.Integer, db.ForeignKey('resource.id')),
-                               db.Column('language_id', db.Integer, db.ForeignKey('language.id'))
+                               db.Column(
+                                   'resource_id',
+                                   db.Integer,
+                                   db.ForeignKey('resource.id')),
+                               db.Column(
+                                   'language_id',
+                                   db.Integer,
+                                   db.ForeignKey('language.id'))
                                )
 
 
 class Resource(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String, nullable=False)
     url = db.Column(URLType, nullable=False, unique=True)
-    category_id = db.Column(db.Integer, db.ForeignKey('category.id'), nullable=False)
+    category_id = db.Column(db.Integer,
+                            db.ForeignKey('category.id'),
+                            nullable=False)
     category = db.relationship('Category')
     languages = db.relationship('Language', secondary=language_identifier)
     paid = db.Column(db.Boolean, default=False)
@@ -72,7 +85,11 @@ def __hash__(self):
         return hash(self.url)
 
     def __repr__(self):
-        return f"<Resource \n\tName: {self.name}\n\tLanguages: {self.languages}\n\tCategory: {self.category}\n\tURL: {self.url}\n>"
+        return (f"<Resource \n"
+                f"\tName: {self.name}\n"
+                f"\tLanguages: {self.languages}\n"
+                f"\tCategory: {self.category}\n"
+                f"\tURL: {self.url}\n>")
 
 
 class Category(db.Model):

requirements.txt

@@ -6,4 +6,4 @@ SQLAlchemy==1.2.8
 SQLAlchemy-Utils==0.33.3
 PyYAML==3.13
 psycopg2-binary==2.7.5
-pylint==2.1.1
+flake8==3.5.0