From c718d4d1422945a756213d22d9e26aa24babe0f6 Mon Sep 17 00:00:00 2001 From: timofey Date: Wed, 28 Dec 2022 07:32:42 +0000 Subject: [PATCH] better __all__ --- requirements.txt | 2 +- setup.py | 2 +- v6d0auth/app.py | 4 ++-- v6d0auth/appfactory.py | 2 ++ v6d0auth/run-server.py | 6 +++--- v6d0auth/sign-request.py | 2 +- v6d0auth/test-request.py | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index f5de724..1b6386c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ aiohttp PyNaCl~=1.4.0 -ptvp35 @ git+https://gitea.parrrate.ru/PTV/ptvp35.git@87ba808c2af1be87f4fbb9d9b3b97ba748cb9fae +ptvp35 @ git+https://gitea.parrrate.ru/PTV/ptvp35.git@e760fca39e2070b9959aeb95b53e59e895f1ad57 diff --git a/setup.py b/setup.py index 8ee30e2..c9e2541 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ setup( ], extras_require={ 'full': [ - 'ptvp35 @ git+https://gitea.parrrate.ru/PTV/ptvp35.git@87ba808c2af1be87f4fbb9d9b3b97ba748cb9fae', + 'ptvp35 @ git+https://gitea.parrrate.ru/PTV/ptvp35.git@e760fca39e2070b9959aeb95b53e59e895f1ad57', ], }, ) diff --git a/v6d0auth/app.py b/v6d0auth/app.py index 4b91bf7..25e48d7 100644 --- a/v6d0auth/app.py +++ b/v6d0auth/app.py @@ -7,8 +7,8 @@ from nacl.signing import VerifyKey from nacl.utils import random from v6d0auth import certs -from v6d0auth.appfactory import AppFactory -from v6d0auth.cdb import CDB, Role, AbstractRequest +from v6d0auth.appfactory import * +from v6d0auth.cdb import * __all__ = ('V6D0AuthAppFactory',) diff --git a/v6d0auth/appfactory.py b/v6d0auth/appfactory.py index fc799c9..3e8db67 100644 --- a/v6d0auth/appfactory.py +++ b/v6d0auth/appfactory.py @@ -1,5 +1,7 @@ from aiohttp import web +__all__ = ('AppFactory',) + class AppFactory: def define_routes(self, routes: web.RouteTableDef) -> None: diff --git a/v6d0auth/run-server.py b/v6d0auth/run-server.py index 15eb216..6f57ec4 100644 --- a/v6d0auth/run-server.py +++ b/v6d0auth/run-server.py @@ -1,8 +1,8 @@ import asyncio -from v6d0auth.app import V6D0AuthAppFactory -from v6d0auth.cdb import CDB -from v6d0auth.run_app import run_app +from v6d0auth.app import * +from v6d0auth.cdb import * +from v6d0auth.run_app import * async def main(): diff --git a/v6d0auth/sign-request.py b/v6d0auth/sign-request.py index 614fe56..cbad3fd 100644 --- a/v6d0auth/sign-request.py +++ b/v6d0auth/sign-request.py @@ -6,7 +6,7 @@ from typing import Literal import aiohttp from v6d0auth import certs -from v6d0auth.config import port, host +from v6d0auth.config import host, port parser = argparse.ArgumentParser() parser.add_argument('handle', type=str) diff --git a/v6d0auth/test-request.py b/v6d0auth/test-request.py index 892f12a..c2729ae 100644 --- a/v6d0auth/test-request.py +++ b/v6d0auth/test-request.py @@ -3,7 +3,7 @@ from subprocess import call from sys import executable from v6d0auth import certs -from v6d0auth.client import request_signature, has_role, request_role +from v6d0auth.client import * async def main():