From d191cf288bd34345029d1a7f02ecfc09e84c6707 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Tue, 8 Sep 2020 12:14:55 +0200 Subject: openpgp: Reduce unnecessary recoding in get_wkd_url() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- gemato/openpgp.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gemato/openpgp.py b/gemato/openpgp.py index c05c476..7d42125 100644 --- a/gemato/openpgp.py +++ b/gemato/openpgp.py @@ -63,14 +63,13 @@ ZBASE32_TRANSLATE = bytes.maketrans( def get_wkd_url(email): - localname, domain = email.encode('utf8').split(b'@', 1) + localname, domain = email.split('@', 1) b32 = ( - base64.b32encode(hashlib.sha1(localname.lower()).digest()) - .translate(ZBASE32_TRANSLATE).decode()) - uenc = urllib.parse.quote(localname) - ldomain = domain.lower().decode('utf8') - return (f'https://{ldomain}/.well-known/openpgpkey/hu/' - f'{b32}?l={uenc}') + base64.b32encode( + hashlib.sha1(localname.encode('utf8').lower()).digest()) + .translate(ZBASE32_TRANSLATE).decode('ASCII')) + return (f'https://{domain.lower()}/.well-known/openpgpkey/hu/' + f'{b32}?l={urllib.parse.quote(localname)}') class SystemGPGEnvironment: -- cgit v1.2.3