remove unused imports, rectify isort violations

Files got into the branch that violate both PEP-8 guidelines
and isorts. This fixes them.

Signed-off-by: Kevin Morris <kevr@0cost.org>

aurweb/git/update.py

@@ -305,9 +305,9 @@ def main():  # noqa: C901
 
         try:
             metadata_pkgbase = metadata['pkgbase']
-        except KeyError as e:
+        except KeyError:
             die_commit('invalid .SRCINFO, does not contain a pkgbase (is the file empty?)',
-                    str(commit.id))
+                       str(commit.id))
         if not re.match(repo_regex, metadata_pkgbase):
             die_commit('invalid pkgbase: {:s}'.format(metadata_pkgbase),
                        str(commit.id))

aurweb/models/user.py

@@ -65,8 +65,6 @@ class User:
 
     def valid_password(self, password: str):
         """ Check authentication against a given password. """
-        from aurweb.db import session
-
         if password is None:
             return False
 

aurweb/routers/html.py

@@ -2,9 +2,8 @@
 decorators in some way; more complex routes should be defined in their
 own modules and imported here. """
 from http import HTTPStatus
-from urllib.parse import unquote
 
-from fastapi import APIRouter, Form, Request, HTTPException
+from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
 
 from aurweb.templates import make_context, render_template

migrations/versions/56e2ce8e2ffa_utf8mb4_charset_and_collation.py

@@ -56,14 +56,14 @@ db_backend = aurweb.config.get("database", "backend")
 def rebuild_unique_indexes_with_str_cols():
     for idx_name in indexes:
         sql = f"""
-DROP INDEX IF EXISTS {idx_name} 
+DROP INDEX IF EXISTS {idx_name}
 ON {indexes.get(idx_name)[0]}
 """
         op.execute(sql)
         sql = f"""
-CREATE UNIQUE INDEX {idx_name} 
-ON {indexes.get(idx_name)[0]} 
-({indexes.get(idx_name)[1]}, {indexes.get(idx_name)[2]}) 
+CREATE UNIQUE INDEX {idx_name}
+ON {indexes.get(idx_name)[0]}
+({indexes.get(idx_name)[1]}, {indexes.get(idx_name)[2]})
 """
         op.execute(sql)
 
@@ -77,8 +77,8 @@ def upgrade():
     def op_execute(table_meta):
         table, charset, collate = table_meta
         sql = f"""
-ALTER TABLE {table} 
-CONVERT TO CHARACTER SET {charset} 
+ALTER TABLE {table}
+CONVERT TO CHARACTER SET {charset}
 COLLATE {collate}
 """
         op.execute(sql)
@@ -94,8 +94,8 @@ def downgrade():
     def op_execute(table_meta):
         table, charset, collate = table_meta
         sql = f"""
-ALTER TABLE {table} 
-CONVERT TO CHARACTER SET {src_charset} 
+ALTER TABLE {table}
+CONVERT TO CHARACTER SET {src_charset}
 COLLATE {src_collate}
 """
         op.execute(sql)

migrations/versions/ef39fcd6e1cd_add_sso_account_id_in_table_users.py

@@ -6,6 +6,7 @@ Create Date: 2020-06-08 10:04:13.898617
 
 """
 import sqlalchemy as sa
+
 from alembic import op
 from sqlalchemy.engine.reflection import Inspector
 

migrations/versions/f47cad5d6d03_initial_revision.py

 """initial revision
 
 Revision ID: f47cad5d6d03
-Revises: 
 Create Date: 2020-02-23 13:23:32.331396
 
 """
-from alembic import op
-import sqlalchemy as sa
-
-
 # revision identifiers, used by Alembic.
 revision = 'f47cad5d6d03'
 down_revision = None

test/test_auth.py

@@ -4,8 +4,6 @@ import pytest
 
 from sqlalchemy.exc import IntegrityError
 
-import aurweb.config
-
 from aurweb.auth import BasicAuthBackend, has_credential
 from aurweb.db import create, query
 from aurweb.models.account_type import AccountType