From 7f89c621a1200e81ee00c39f63b25072be93677f Mon Sep 17 00:00:00 2001 From: Mark Tearle Date: Wed, 25 Nov 2020 23:29:49 +0800 Subject: [PATCH] Address coverage for Python 2, tidy up variable names in _is_valid_dkim_key --- octodns/provider/ovh.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/octodns/provider/ovh.py b/octodns/provider/ovh.py index 0ee8e61..9f7cd9a 100644 --- a/octodns/provider/ovh.py +++ b/octodns/provider/ovh.py @@ -371,12 +371,11 @@ class OvhProvider(BaseProvider): @staticmethod def _is_valid_dkim_key(key): result = True + base64_decode = getattr(base64, 'decodestring', None) + base64_decode = getattr(base64, 'decodebytes', base64_decode) + try: - decode = base64.decodestring - except AttributeError: - decode = base64.decodebytes - try: - result = decode(bytearray(key, 'utf-8')) + result = base64_decode(bytearray(key, 'utf-8')) except binascii.Error: result = False return result