From 58adac56638e1a7f3097aaaee9a3accd67a4fd24 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 9 Aug 2019 15:30:35 -0700 Subject: [PATCH] zthumbor: Clean up type ignores. Signed-off-by: Anders Kaseorg --- zthumbor/loaders/zloader.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zthumbor/loaders/zloader.py b/zthumbor/loaders/zloader.py index c7ea65103c..b9d6497b51 100644 --- a/zthumbor/loaders/zloader.py +++ b/zthumbor/loaders/zloader.py @@ -27,7 +27,7 @@ def get_not_found_result(): def load(context, url, callback): # type: (Context, str, Callable[..., Any]) -> None source_type, encoded_url = separate_url_and_source_type(url) - actual_url = base64.urlsafe_b64decode(urllib.parse.unquote(encoded_url)) + actual_url = base64.urlsafe_b64decode(urllib.parse.unquote(encoded_url)).decode('utf-8') if source_type not in (THUMBOR_S3_TYPE, THUMBOR_LOCAL_FILE_TYPE, THUMBOR_EXTERNAL_TYPE): callback(get_not_found_result()) @@ -35,20 +35,20 @@ def load(context, url, callback): return if source_type == THUMBOR_S3_TYPE: - if actual_url.startswith('/user_uploads/'): # type: ignore # python 2 type differs from python 3 type + if actual_url.startswith('/user_uploads/'): actual_url = actual_url[len('/user_uploads/'):] else: raise AssertionError("Unexpected s3 file.") s3_loader.load(context, actual_url, callback) elif source_type == THUMBOR_LOCAL_FILE_TYPE: - if actual_url.startswith('/user_uploads/'): # type: ignore # python 2 type differs from python 3 type + if actual_url.startswith('/user_uploads/'): actual_url = actual_url[len('/user_uploads/'):] local_file_path_prefix = 'files/' else: raise AssertionError("Unexpected local file.") - patched_local_url = local_file_path_prefix + actual_url # type: ignore # python 2 type differs from python 3 type + patched_local_url = local_file_path_prefix + actual_url file_loader.load(context, patched_local_url, callback) elif source_type == THUMBOR_EXTERNAL_TYPE: https_loader.load(context, actual_url, callback)