fix accessing 'self.exc' in …API methods

mikf · mikf · commit 1b474836f9ff · 2026-02-17T08:32:44.000+01:00
fixes regression introduced in 53cdfaa
diff --git a/gallery_dl/extractor/arcalive.py b/gallery_dl/extractor/arcalive.py
@@ -173,7 +173,7 @@ def _call(self, endpoint, params=None):
             msg = "API request failed: " + msg
         else:
             msg = "API request failed"
-        raise self.exc.AbortExtraction(msg)
+        raise self.extractor.exc.AbortExtraction(msg)
 
     def _pagination(self, endpoint, params, key):
         while True:
diff --git a/gallery_dl/extractor/bilibili.py b/gallery_dl/extractor/bilibili.py
@@ -116,6 +116,7 @@ def articles(self):
 class BilibiliAPI():
     def __init__(self, extractor):
         self.extractor = extractor
+        self.exc = extractor.exc
 
     def _call(self, endpoint, params):
         url = "https://api.bilibili.com/x/polymer/web-dynamic/v1" + endpoint
diff --git a/gallery_dl/extractor/bluesky.py b/gallery_dl/extractor/bluesky.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2024-2025 Mike Fährmann
+# Copyright 2024-2026 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -569,7 +569,7 @@ def _authenticate_impl(self, username):
 
         if response.status_code != 200:
             self.log.debug("Server response: %s", data)
-            raise self.exc.AuthenticationError(
+            raise self.extractor.exc.AuthenticationError(
                 f"\"{data.get('error')}: {data.get('message')}\"")
 
         _refresh_token_cache.update(self.username, data["refreshJwt"])
@@ -600,7 +600,7 @@ def _call(self, endpoint, params, root=None):
                 msg = f"{msg} ({response.status_code} {response.reason})"
 
             self.extractor.log.debug("Server response: %s", response.text)
-            raise self.exc.AbortExtraction(msg)
+            raise self.extractor.exc.AbortExtraction(msg)
 
     def _pagination(self, endpoint, params,
                     key="feed", root=None, check_empty=False):
diff --git a/gallery_dl/extractor/boosty.py b/gallery_dl/extractor/boosty.py
@@ -380,14 +380,15 @@ def _call(self, endpoint, params=None):
                 return response.json()
 
             elif response.status_code < 400:
-                raise self.exc.AuthenticationError("Invalid API access token")
+                raise self.extractor.exc.AuthenticationError(
+                    "Invalid API access token")
 
             elif response.status_code == 429:
                 self.extractor.wait(seconds=600)
 
             else:
                 self.extractor.log.debug(response.text)
-                raise self.exc.AbortExtraction("API request failed")
+                raise self.extractor.exc.AbortExtraction("API request failed")
 
     def _pagination(self, endpoint, params, transform=None, key=None):
         if "is_only_allowed" not in params and self.extractor.only_allowed:
diff --git a/gallery_dl/extractor/civitai.py b/gallery_dl/extractor/civitai.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2024-2025 Mike Fährmann
+# Copyright 2024-2026 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -201,7 +201,8 @@ def _require_auth(self):
         if "Authorization" not in self.api.headers and \
                 not self.cookies.get(
                 "__Secure-civitai-token", domain=".civitai.com"):
-            raise self.exc.AuthRequired(("api-key", "authenticated cookies"))
+            raise self.extractor.exc.AuthRequired(
+                ("api-key", "authenticated cookies"))
 
     def _parse_query(self, value):
         return text.parse_query_list(
diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py
@@ -1187,6 +1187,7 @@ class DeviantartOAuthAPI():
     def __init__(self, extractor):
         self.extractor = extractor
         self.log = extractor.log
+        self.exc = extractor.exc
         self.headers = {"dA-minor-version": "20210526"}
         self._warn_429 = True
 
@@ -1808,7 +1809,7 @@ def _ids_watching(self, user):
 
         pos = page.find('\\"name\\":\\"watching\\"')
         if pos < 0:
-            raise self.exc.NotFoundError("'watching' module ID")
+            raise self.extractor.exc.NotFoundError("'watching' module ID")
         module_id = text.rextr(page, '\\"id\\":', ',', pos).strip('" ')
 
         self._fetch_csrf_token(page)
diff --git a/gallery_dl/extractor/discord.py b/gallery_dl/extractor/discord.py
@@ -490,7 +490,8 @@ def _pagination(self, method, batch):
             offset += len(data)
 
     def _raise_invalid_token(self):
-        raise self.exc.AuthenticationError("""Invalid or missing token.
+        raise self.extractor.exc.AuthenticationError("""\
+Invalid or missing token.
 Please provide a valid token following these instructions:
 
 1) Open Discord in your browser (https://discord.com/app);
diff --git a/gallery_dl/extractor/imagechest.py b/gallery_dl/extractor/imagechest.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Copyright 2020 Leonid "Bepis" Pavel
-# Copyright 2023-2025 Mike Fährmann
+# Copyright 2023-2026 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -142,11 +142,12 @@ def _call(self, endpoint):
                 return response.json()["data"]
 
             elif response.status_code < 400:
-                raise self.exc.AuthenticationError("Invalid API access token")
+                raise self.extractor.exc.AuthenticationError(
+                    "Invalid API access token")
 
             elif response.status_code == 429:
                 self.extractor.wait(seconds=600)
 
             else:
                 self.extractor.log.debug(response.text)
-                raise self.exc.AbortExtraction("API request failed")
+                raise self.extractor.exc.AbortExtraction("API request failed")
diff --git a/gallery_dl/extractor/inkbunny.py b/gallery_dl/extractor/inkbunny.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2020-2025 Mike Fährmann
+# Copyright 2020-2026 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -348,7 +348,7 @@ def _call(self, endpoint, params):
                 self.authenticate(invalidate=True)
                 continue
 
-            raise self.exc.AbortExtraction(data.get("error_message"))
+            raise self.extractor.exc.AbortExtraction(data.get("error_message"))
 
     def _pagination_search(self, params):
         params["page"] = 1
diff --git a/gallery_dl/extractor/instagram.py b/gallery_dl/extractor/instagram.py
@@ -804,6 +804,7 @@ class InstagramRestAPI():
 
     def __init__(self, extractor):
         self.extractor = extractor
+        self.exc = extractor.exc
 
         _cache = self.extractor.config("user-cache", True)
         _cache = memcache if not _cache or _cache == "memory" else cache
@@ -1087,7 +1088,8 @@ def __init__(self, extractor):
         self.user_id = api.user_id
 
     def _unsupported(self, _=None):
-        raise self.exc.AbortExtraction("Unsupported with GraphQL API")
+        raise self.extractor.exc.AbortExtraction(
+            "Unsupported with GraphQL API")
 
     def highlights_tray(self, user_id):
         query_hash = "d4d88dc1500312af6f937f7b804c68c3"
diff --git a/gallery_dl/extractor/iwara.py b/gallery_dl/extractor/iwara.py
@@ -297,6 +297,7 @@ class IwaraAPI():
 
     def __init__(self, extractor):
         self.extractor = extractor
+        self.exc = extractor.exc
         self.headers = {
             "Referer"     : extractor.root + "/",
             "Content-Type": "application/json",
diff --git a/gallery_dl/extractor/lofter.py b/gallery_dl/extractor/lofter.py
@@ -132,11 +132,11 @@ def _call(self, endpoint, data):
         info = response.json()
 
         if info["meta"]["status"] == 4200:
-            raise self.exc.NotFoundError("blog")
+            raise self.extractor.exc.NotFoundError("blog")
 
         if info["meta"]["status"] != 200:
             self.extractor.log.debug("Server response: %s", info)
-            raise self.exc.AbortExtraction("API request failed")
+            raise self.extractor.exc.AbortExtraction("API request failed")
 
         return info["response"]
 
diff --git a/gallery_dl/extractor/mangadex.py b/gallery_dl/extractor/mangadex.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2018-2025 Mike Fährmann
+# Copyright 2018-2026 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -333,7 +333,8 @@ def _authenticate_impl_client(self, username, password):
         try:
             access_token = data["access_token"]
         except Exception:
-            raise self.exc.AuthenticationError(data.get("error_description"))
+            raise self.extractor.exc.AuthenticationError(
+                data.get("error_description"))
 
         if refresh_token != data.get("refresh_token"):
             _refresh_token_cache.update(
@@ -356,7 +357,7 @@ def _authenticate_impl_legacy(self, username, password):
         data = self.extractor.request_json(
             url, method="POST", json=json, fatal=None)
         if data.get("result") != "ok":
-            raise self.exc.AuthenticationError()
+            raise self.extractor.exc.AuthenticationError()
 
         if refresh_token != data["token"]["refresh"]:
             _refresh_token_cache.update(username, data["token"]["refresh"])
@@ -381,7 +382,7 @@ def _call(self, endpoint, params=None, auth=False):
 
             msg = ", ".join(f'{error["title"]}: "{error["detail"]}"'
                             for error in response.json()["errors"])
-            raise self.exc.AbortExtraction(
+            raise self.extractor.exc.AbortExtraction(
                 f"{response.status_code} {response.reason} ({msg})")
 
     def _pagination_chapters(self, endpoint, params=None, auth=False):
diff --git a/gallery_dl/extractor/mastodon.py b/gallery_dl/extractor/mastodon.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2019-2025 Mike Fährmann
+# Copyright 2019-2026 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -215,6 +215,7 @@ class MastodonAPI():
     def __init__(self, extractor):
         self.root = extractor.root
         self.extractor = extractor
+        self.exc = extractor.exc
 
         access_token = extractor.config("access-token")
         if access_token is None or access_token == "cache":
diff --git a/gallery_dl/extractor/misskey.py b/gallery_dl/extractor/misskey.py
@@ -239,7 +239,7 @@ def notes_show(self, note_id):
     def i_favorites(self):
         endpoint = "/i/favorites"
         if not self.access_token:
-            raise self.exc.AuthenticationError()
+            raise self.extractor.exc.AuthenticationError()
         data = {"i": self.access_token}
         return self._pagination(endpoint, data)
 
diff --git a/gallery_dl/extractor/pexels.py b/gallery_dl/extractor/pexels.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2025 Mike Fährmann
+# Copyright 2025-2026 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -174,7 +174,7 @@ def _call(self, endpoint, params):
 
             else:
                 self.extractor.log.debug(response.text)
-                raise self.exc.AbortExtraction("API request failed")
+                raise self.extractor.exc.AbortExtraction("API request failed")
 
     def _pagination(self, endpoint, params):
         while True:
diff --git a/gallery_dl/extractor/philomena.py b/gallery_dl/extractor/philomena.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2021-2025 Mike Fährmann
+# Copyright 2021-2026 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -159,7 +159,7 @@ def _call(self, endpoint, params=None):
 
             # error
             self.extractor.log.debug(response.content)
-            raise self.exc.HttpError("", response)
+            raise self.extractor.exc.HttpError("", response)
 
     def _pagination(self, endpoint, params):
         extr = self.extractor
diff --git a/gallery_dl/extractor/pinterest.py b/gallery_dl/extractor/pinterest.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2016-2025 Mike Fährmann
+# Copyright 2016-2026 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -545,9 +545,9 @@ def _call(self, resource, options):
             return data
         if response.status_code == 404:
             resource = self.extractor.subcategory.rpartition("-")[2]
-            raise self.exc.NotFoundError(resource)
+            raise self.extractor.exc.NotFoundError(resource)
         self.extractor.log.debug("Server response: %s", response.text)
-        raise self.exc.AbortExtraction("API request failed")
+        raise self.extractor.exc.AbortExtraction("API request failed")
 
     def _pagination(self, resource, options):
         while True:
diff --git a/gallery_dl/extractor/pixiv.py b/gallery_dl/extractor/pixiv.py
@@ -1123,6 +1123,7 @@ class PixivAppAPI():
     def __init__(self, extractor):
         self.extractor = extractor
         self.log = extractor.log
+        self.exc = extractor.exc
         self.username = extractor._get_auth_info()[0]
         self.user = None
 
diff --git a/gallery_dl/extractor/reddit.py b/gallery_dl/extractor/reddit.py
@@ -525,7 +525,7 @@ def _authenticate_impl(self, refresh_token=None):
 
         if response.status_code != 200:
             self.log.debug("Server response: %s", data)
-            raise self.exc.AuthenticationError(
+            raise self.extractor.exc.AuthenticationError(
                 f"\"{data.get('error')}: {data.get('message')}\"")
         return "Bearer " + data["access_token"]
 
@@ -555,16 +555,17 @@ def _call(self, endpoint, params):
             try:
                 data = response.json()
             except ValueError:
-                raise self.exc.AbortExtraction(
+                raise self.extractor.exc.AbortExtraction(
                     text.remove_html(response.text))
 
             if "error" in data:
+                exc = self.extractor.exc
                 if data["error"] == 403:
-                    raise self.exc.AuthorizationError()
+                    raise exc.AuthorizationError()
                 if data["error"] == 404:
-                    raise self.exc.NotFoundError()
+                    raise exc.NotFoundError()
                 self.log.debug(data)
-                raise self.exc.AbortExtraction(data.get("message"))
+                raise exc.AbortExtraction(data.get("message"))
             return data
 
     def _pagination(self, endpoint, params):
@@ -592,7 +593,7 @@ def _pagination(self, endpoint, params):
                         if post["num_comments"] and self.comments:
                             try:
                                 yield self.submission(post["id"])
-                            except self.exc.AuthorizationError:
+                            except self.extractor.exc.AuthorizationError:
                                 pass
                         else:
                             yield post, ()
diff --git a/gallery_dl/extractor/sankaku.py b/gallery_dl/extractor/sankaku.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2014-2025 Mike Fährmann
+# Copyright 2014-2026 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -284,7 +284,7 @@ def _call(self, endpoint, params=None):
             if response.status_code == 429:
                 until = response.headers.get("X-RateLimit-Reset")
                 if not until and b"_tags-explicit-limit" in response.content:
-                    raise self.exc.AuthorizationError(
+                    raise self.extractor.exc.AuthorizationError(
                         "Search tag limit exceeded")
                 seconds = None if until else 600
                 self.extractor.wait(until=until, seconds=seconds)
@@ -305,7 +305,7 @@ def _call(self, endpoint, params=None):
                     code = f"'{code.rpartition('__')[2].replace('-', ' ')}'"
                 except Exception:
                     pass
-                raise self.exc.AbortExtraction(code)
+                raise self.extractor.exc.AbortExtraction(code)
             return data
 
     def _pagination(self, endpoint, params):
diff --git a/gallery_dl/extractor/twibooru.py b/gallery_dl/extractor/twibooru.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2022-2025 Mike Fährmann
+# Copyright 2022-2026 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -153,7 +153,7 @@ def _call(self, endpoint, params=None):
 
             # error
             self.extractor.log.debug(response.content)
-            raise self.exc.HttpError("", response)
+            raise self.extractor.exc.HttpError("", response)
 
     def _pagination(self, endpoint, params):
         extr = self.extractor
diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py
diff --git a/gallery_dl/extractor/wallhaven.py b/gallery_dl/extractor/wallhaven.py
diff --git a/gallery_dl/oauth.py b/gallery_dl/oauth.py
