Flake8 everything (#610)

Dreamsorcerer · web-flow · commit d4290ec4b09d · 2021-08-07T12:59:11.000Z
diff --git a/.flake8 b/.flake8
@@ -11,9 +11,10 @@ ignore = E226,E501,E722,W503
 per-file-ignores =
     # S101: Pytest uses assert
     tests/*:S101
+    # I900: Requirements for examples shouldn't be included
+    examples/*:I900
 
 # flake8-import-order
-application-import-names = aiohttp_session
 import-order-style = pycharm
 
 # flake8-quotes
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Some simple testing tasks (sorry, UNIX only).
 
 flake:
-	flake8 aiohttp_session tests
+	flake8
 
 
 test: flake
diff --git a/demo/flash_messages_example.py b/demo/flash_messages_example.py
@@ -1,10 +1,10 @@
 import base64
 from typing import Awaitable, Callable, List, NoReturn, cast
 
-from cryptography import fernet
 from aiohttp import web
-from aiohttp_session import setup, get_session
+from aiohttp_session import get_session, setup
 from aiohttp_session.cookie_storage import EncryptedCookieStorage
+from cryptography import fernet
 
 _Handler = Callable[[web.Request], Awaitable[web.StreamResponse]]
 
@@ -22,8 +22,8 @@ async def process(request: web.Request) -> web.StreamResponse:
         session = await get_session(request)
         request['flash_incoming'] = session.pop('flash', [])
         response = await handler(request)
-        session['flash'] = (request.get('flash_incoming', []) +
-                            request.get('flash_outgoing', []))
+        session['flash'] = (request.get('flash_incoming', [])
+                            + request.get('flash_outgoing', []))
         return response
     return process
 
@@ -55,4 +55,3 @@ def make_app() -> web.Application:
 
 
 web.run_app(make_app())
-
diff --git a/demo/login_required_example.py b/demo/login_required_example.py
@@ -2,10 +2,10 @@
 from http import HTTPStatus
 from typing import Any, Awaitable, Callable
 
-from cryptography import fernet
 from aiohttp import web
-from aiohttp_session import setup, get_session, new_session
+from aiohttp_session import get_session, new_session, setup
 from aiohttp_session.cookie_storage import EncryptedCookieStorage
+from cryptography import fernet
 
 
 DATABASE = [
diff --git a/demo/main.py b/demo/main.py
@@ -1,9 +1,10 @@
-import time
 import base64
-from cryptography import fernet
+import time
+
 from aiohttp import web
-from aiohttp_session import setup, get_session
+from aiohttp_session import get_session, setup
 from aiohttp_session.cookie_storage import EncryptedCookieStorage
+from cryptography import fernet
 
 
 async def handler(request: web.Request) -> web.Response:
diff --git a/demo/memcached_storage.py b/demo/memcached_storage.py
@@ -1,9 +1,9 @@
-import time
-from aiohttp import web
 import asyncio
-import aiomcache
-from aiohttp_session import setup, get_session
+import time
 
+import aiomcache
+from aiohttp import web
+from aiohttp_session import get_session, setup
 from aiohttp_session.memcached_storage import MemcachedStorage
 
 
diff --git a/demo/redis_storage.py b/demo/redis_storage.py
@@ -1,10 +1,9 @@
-import asyncio
-import aioredis
 import time
 from typing import AsyncIterator
 
+import aioredis
 from aiohttp import web
-from aiohttp_session import setup, get_session
+from aiohttp_session import get_session, setup
 from aiohttp_session.redis_storage import RedisStorage
 
 
@@ -16,7 +15,7 @@ async def handler(request: web.Request) -> web.Response:
     return web.Response(text=text)
 
 
-async def redis_pool(app: web.Application) -> AsyncIterator[aioredis.commands.Redis]:  # type: ignore[no-any-unimported]
+async def redis_pool(app: web.Application) -> AsyncIterator[aioredis.commands.Redis]:  # type: ignore[no-any-unimported]  # noqa: B950
     redis_address = ('127.0.0.1', '6379')
     async with await aioredis.create_redis_pool(redis_address, timeout=1) as redis:
         storage = RedisStorage(redis)
diff --git a/docs/conf.py b/docs/conf.py
@@ -13,10 +13,10 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
-import os
 import codecs
+import os
 import re
+import sys
 
 _docs_path = os.path.dirname(__file__)
 _version_path = os.path.abspath(os.path.join(_docs_path,
diff --git a/examples/postgres_storage.py b/examples/postgres_storage.py
@@ -1,6 +1,6 @@
 import json
 import uuid
-from typing import Any, Callable, Dict, Optional
+from typing import Any, Callable, Optional
 
 import psycopg2.extras
 from aiohttp import web
@@ -11,7 +11,7 @@
 class PgStorage(AbstractStorage):
     """PG storage"""
 
-    def __init__(self, pg_pool: Pool, *, cookie_name: str = "AIOHTTP_SESSION",  # type: ignore[no-any-unimported]
+    def __init__(self, pg_pool: Pool, *, cookie_name: str = "AIOHTTP_SESSION",  # type: ignore[no-any-unimported] # noqa: B950
                  domain: Optional[str] = None, max_age: Optional[int] = None,
                  path: str = '/', secure: Optional[bool] = None, httponly: bool = True,
                  key_factory: Callable[[], str] = lambda: uuid.uuid4().hex,
@@ -34,7 +34,8 @@ async def load_session(self, request: web.Request) -> Session:
                 key = uuid.UUID(cookie)
                 async with conn.cursor(cursor_factory=psycopg2.extras.DictCursor) as cur:
 
-                    await cur.execute("SELECT session, extract(epoch from created) FROM web.sessions WHERE uuid = %s", (key,))
+                    await cur.execute("SELECT session, extract(epoch from created) "  # noqa: S608
+                                      + "FROM web.sessions WHERE uuid = %s", (key,))
                     data = await cur.fetchone()
 
                     if not data:
@@ -63,9 +64,10 @@ async def save_session(self, request: web.Request, response: web.StreamResponse,
         expire = data["created"] + (session.max_age or 0)
         async with self._pg.acquire() as conn:
             async with conn.cursor() as cur:
-                await cur.execute("INSERT INTO web.sessions (uuid,session,created,expire)"
-                    " VALUES (%s, %s, to_timestamp(%s),to_timestamp(%s))"
-                    " ON CONFLICT (uuid)"
-                    " DO UPDATE"
-                    " SET (session,expire)=(EXCLUDED.session, EXCLUDED.expire)",
+                await cur.execute(
+                    "INSERT INTO web.sessions (uuid,session,created,expire)"  # noqa: S608
+                    + " VALUES (%s, %s, to_timestamp(%s),to_timestamp(%s))"  # noqa: S608
+                    + " ON CONFLICT (uuid)"  # noqa: S608
+                    + " DO UPDATE"  # noqa: S608
+                    + " SET (session,expire)=(EXCLUDED.session, EXCLUDED.expire)",
                     [key, data_encoded, data["created"], expire])
diff --git a/setup.py b/setup.py
@@ -1,7 +1,8 @@
-from setuptools import setup
 import os
 import re
 
+from setuptools import setup
+
 
 with open(os.path.join(os.path.abspath(os.path.dirname(
         __file__)), 'aiohttp_session', '__init__.py'), 'r', encoding='latin1') as fp:
@@ -14,6 +15,7 @@
 def read(f):
     return open(os.path.join(os.path.dirname(__file__), f)).read().strip()
 
+
 install_requires = ['aiohttp>=3.0.1', 'typing_extensions>=3.7.4; python_version<"3.8"']
 extras_require = {
     'aioredis': ['aioredis>=1.0.0'],
diff --git a/tests/test_abstract_storage.py b/tests/test_abstract_storage.py
@@ -6,8 +6,8 @@
 from aiohttp import web
 from aiohttp.test_utils import TestClient
 from aiohttp.web_middlewares import _Handler
-
 from aiohttp_session import SimpleCookieStorage, get_session, setup as setup_middleware
+
 from .typedefs import AiohttpClient
 
 
diff --git a/tests/test_cookie_storage.py b/tests/test_cookie_storage.py
@@ -5,8 +5,8 @@
 from aiohttp import web
 from aiohttp.test_utils import TestClient
 from aiohttp.web_middlewares import _Handler
-
 from aiohttp_session import Session, SimpleCookieStorage, get_session, session_middleware
+
 from .typedefs import AiohttpClient
 
 
diff --git a/tests/test_encrypted_cookie_storage.py b/tests/test_encrypted_cookie_storage.py
@@ -8,10 +8,10 @@
 from aiohttp import web
 from aiohttp.test_utils import TestClient
 from aiohttp.web_middlewares import _Handler
-from cryptography.fernet import Fernet
-
 from aiohttp_session import Session, get_session, new_session, session_middleware
 from aiohttp_session.cookie_storage import EncryptedCookieStorage
+from cryptography.fernet import Fernet
+
 from .typedefs import AiohttpClient
 
 
diff --git a/tests/test_get_session.py b/tests/test_get_session.py
@@ -1,7 +1,6 @@
 import pytest
 from aiohttp import web
 from aiohttp.test_utils import make_mocked_request
-
 from aiohttp_session import (AbstractStorage, SESSION_KEY, STORAGE_KEY, Session,
                              get_session, new_session)
 
diff --git a/tests/test_http_exception.py b/tests/test_http_exception.py
@@ -2,8 +2,8 @@
 
 from aiohttp import web
 from aiohttp.web_middlewares import _Handler
-
 from aiohttp_session import SimpleCookieStorage, get_session, session_middleware
+
 from .typedefs import AiohttpClient
 
 
diff --git a/tests/test_memcached_storage.py b/tests/test_memcached_storage.py
@@ -8,9 +8,9 @@
 from aiohttp import web
 from aiohttp.test_utils import TestClient
 from aiohttp.web_middlewares import _Handler
-
 from aiohttp_session import Session, get_session, session_middleware
 from aiohttp_session.memcached_storage import MemcachedStorage
+
 from .typedefs import AiohttpClient
 
 
diff --git a/tests/test_nacl_storage.py b/tests/test_nacl_storage.py
@@ -9,10 +9,10 @@
 from aiohttp import web
 from aiohttp.test_utils import TestClient
 from aiohttp.web_middlewares import _Handler
-from nacl.encoding import Base64Encoder
-
 from aiohttp_session import Session, get_session, new_session, session_middleware
 from aiohttp_session.nacl_storage import NaClCookieStorage
+from nacl.encoding import Base64Encoder
+
 from .typedefs import AiohttpClient
 
 
diff --git a/tests/test_path_domain.py b/tests/test_path_domain.py
@@ -6,8 +6,8 @@
 from aiohttp import web
 from aiohttp.test_utils import TestClient
 from aiohttp.web_middlewares import _Handler
-
 from aiohttp_session import SimpleCookieStorage, get_session, session_middleware
+
 from .typedefs import AiohttpClient
 
 
diff --git a/tests/test_redis_storage.py b/tests/test_redis_storage.py
@@ -9,10 +9,10 @@
 from aiohttp import web
 from aiohttp.test_utils import TestClient
 from aiohttp.web_middlewares import _Handler
-from pytest_mock import MockFixture
-
 from aiohttp_session import Session, get_session, session_middleware
 from aiohttp_session.redis_storage import RedisStorage
+from pytest_mock import MockFixture
+
 from .typedefs import AiohttpClient
 
 
diff --git a/tests/test_response_types.py b/tests/test_response_types.py
@@ -4,8 +4,8 @@
 from aiohttp import web
 from aiohttp.test_utils import make_mocked_request
 from aiohttp.web_middlewares import _Handler
-
 from aiohttp_session import SESSION_KEY, SimpleCookieStorage, get_session, session_middleware
+
 from .typedefs import AiohttpClient
 
 
diff --git a/tests/test_session_dict.py b/tests/test_session_dict.py
@@ -2,7 +2,6 @@
 from typing import Any, MutableMapping, cast
 
 import pytest
-
 from aiohttp_session import Session
 
 
diff --git a/tests/test_session_middleware.py b/tests/test_session_middleware.py
@@ -1,5 +1,4 @@
 import pytest
-
 from aiohttp_session import session_middleware
 
 
