From 9f8bc4b9a4618b9bcaa573163e877a41e539d18f Mon Sep 17 00:00:00 2001 From: Dominic Zimmer Date: Fri, 17 Jul 2020 22:17:14 +0200 Subject: [PATCH] Make python 3.7 compatible --- main.py | 4 ++-- model.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/main.py b/main.py index 3969df4..7f4fbf8 100644 --- a/main.py +++ b/main.py @@ -24,7 +24,7 @@ def get_client(request: aiohttp.web.Request): raise aiohttp.web.HTTPBadRequest() if not model.exists_client(client): - print(f'[get_client] model does not know {client=}') + #print(f'[get_client] model does not know {client=}') raise aiohttp.web.HTTPBadRequest() return client @@ -40,7 +40,7 @@ async def handler(request: aiohttp.web.Request): @routes.get(CLIENT_REGEX + '/') async def handler(request: aiohttp.web.Request): client = get_client(request) - print(f"{client=} accessed") + #print(f"{client=} accessed") return aiohttp.web.FileResponse('ui.html') @routes.post('/api/token{authtoken}/{method}') diff --git a/model.py b/model.py index 87fac0a..19d1af0 100644 --- a/model.py +++ b/model.py @@ -6,8 +6,9 @@ import datetime import hashlib def generate_random_id(_s=set()): - while (new_id := base64.b32encode(bytearray(random.randint(0, 0xFF) for _ in range(10)))[:16].decode().lower()) in _s: - pass + newid = base64.b32encode(bytearray(random.randint(0, 0xFF) for _ in range(10)))[:16].decode().lower() + while (new_id in _s): + newid = base64.b32encode(bytearray(random.randint(0, 0xFF) for _ in range(10)))[:16].decode().lower() _s.add(new_id) return new_id