From d59083b4573f715bae98d10d9fe8b584b096805c Mon Sep 17 00:00:00 2001 From: jake Date: Wed, 27 Dec 2023 10:37:05 -0800 Subject: [PATCH] mypy......... --- internetarchive/iarequest.py | 7 +++++-- internetarchive/item.py | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/internetarchive/iarequest.py b/internetarchive/iarequest.py index b1ee3f94..60505dd6 100644 --- a/internetarchive/iarequest.py +++ b/internetarchive/iarequest.py @@ -223,6 +223,7 @@ def prepare(self, method=None, url=None, headers=None, files=None, data=None, append_list=None, insert=None): self.prepare_method(method) self.prepare_url(url, params) + self.identifier = self.url.split("?")[0].split("/")[-1] self.prepare_headers(headers) self.prepare_cookies(cookies) self.prepare_body(metadata, source_metadata, target, priority, append, @@ -263,7 +264,8 @@ def prepare_body(self, metadata, source_metadata, target, priority, append, append_list, insert) except KeyError: - raise ItemLocateError + raise ItemLocateError(f"{self.identifier} cannot be located " + "because it is dark or does not exist.") elif key.startswith('files'): patch = prepare_files_patch(metadata[key], source_metadata['files'], @@ -289,7 +291,8 @@ def prepare_body(self, metadata, source_metadata, target, priority, append, patch = prepare_patch(metadata, source_metadata['metadata'], append, append_list, insert) except KeyError: - raise ItemLocateError + raise ItemLocateError(f"{self.identifier} cannot be located " + "because it is dark or does not exist.") elif 'files' in target: patch = prepare_files_patch(metadata, source_metadata['files'], append, target, append_list, insert) diff --git a/internetarchive/item.py b/internetarchive/item.py index 18a2d072..1cd3cfe0 100644 --- a/internetarchive/item.py +++ b/internetarchive/item.py @@ -1106,9 +1106,9 @@ def _build_request(): return response except HTTPError as exc: try: - msg = get_s3_xml_text(exc.response.content) + msg = get_s3_xml_text(exc.response.content) # type: ignore except ExpatError: # probably HTTP 500 error and response is invalid XML - msg = ('IA S3 returned invalid XML ' + msg = ('IA S3 returned invalid XML ' # type: ignore f'(HTTP status code {exc.response.status_code}). ' 'This is a server side error which is either temporary, ' 'or requires the intervention of IA admins.')