Better handling of download errors.

Author: funilrys

PyFunceble/cli/utils/version.py

@@ -55,7 +55,6 @@
 from datetime import datetime, timezone
 
 import colorama
-import requests
 from box import Box
 
 import PyFunceble.cli.storage
@@ -65,6 +64,7 @@
 from PyFunceble.converter.internal_url import InternalUrlConverter
 from PyFunceble.helpers.dict import DictHelper
 from PyFunceble.helpers.download import DownloadHelper
+from PyFunceble.helpers.exceptions import UnableToDownload
 from PyFunceble.utils.version import VersionUtility
 
 
@@ -86,7 +86,7 @@ def get_upstream_version() -> Box:
                 else True
             ),
         ).download_text()
-    except requests.exceptions.RequestException:
+    except UnableToDownload:
         response = "{}"
 
     return Box(

PyFunceble/helpers/download.py

@@ -363,16 +363,21 @@ def download_text(
         :raise UnableToDownload: When could not unable to download the URL.
         """
 
-        req = self.session.get(self.url, verify=self.certificate_validation)
+        try:
+            req = self.session.get(self.url, verify=self.certificate_validation)
 
-        if req.status_code == 200:
-            response = req.text
+            if req.status_code == 200:
+                response = req.text
 
-            if destination and isinstance(destination, str):
-                FileHelper(destination).write(req.text, overwrite=True)
+                if destination and isinstance(destination, str):
+                    FileHelper(destination).write(req.text, overwrite=True)
 
-            return response
+                return response
 
-        raise PyFunceble.helpers.exceptions.UnableToDownload(
-            f"{req.url} (retries: {self.retries} | status code: {req.status_code})"
-        )
+            raise PyFunceble.helpers.exceptions.UnableToDownload(
+                f"{req.url} (retries: {self.retries} | status code: {req.status_code})"
+            )
+        except requests.exceptions.RequestException as exception:
+            raise PyFunceble.helpers.exceptions.UnableToDownload(
+                f"{self.url} (could not resolve?)"
+            ) from exception