Simply return the redirect instead of raising error

joente · joente · commit 1fc19260b325 · 2026-01-20T11:01:59.000+01:00
diff --git a/libservice/exceptions.py b/libservice/exceptions.py
@@ -23,3 +23,15 @@ def __init__(self, result: dict):
         assert isinstance(result, dict)
         self.result = result
         super().__init__('No count exception')
+
+
+class RedirectException(Exception):
+    pass
+
+
+class RedirectsNotAllowed(RedirectException):
+    pass
+
+
+class TooManyRedirects(RedirectException):
+    pass
diff --git a/libservice/utils.py b/libservice/utils.py
@@ -4,6 +4,7 @@
 from urllib.parse import urlparse
 from typing import TYPE_CHECKING
 from .addr import addr_check
+from .exceptions import TooManyRedirects, RedirectsNotAllowed
 if TYPE_CHECKING:
     import aiohttp
 try:
@@ -90,10 +91,9 @@ async def safe_get(uri: str,
             await addr_check(current_uri)
             async with session.get(current_uri,
                                    allow_redirects=False) as resp:
-                if resp.status not in (301, 302, 303, 307, 308):
+                if allow_redirects is False or \
+                        resp.status not in (301, 302, 303, 307, 308):
                     return resp
-                if allow_redirects is False:
-                    raise Exception('Redirects not allowed')
                 next_url = resp.headers.get('Location')
                 if not next_url:
                     break
@@ -105,4 +105,4 @@ async def safe_get(uri: str,
                     current_uri = next_url
                 continue
 
-    raise Exception('Too many redirects')
+    raise TooManyRedirects('Too many redirects')
diff --git a/version.py b/version.py
@@ -1 +1 @@
-__version__ = '1.0.2'
+__version__ = '1.0.3'

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = '1.0.2'`
	`1`	`+__version__ = '1.0.3'`