hdx-python-utilities 4.0.1__tar.gz → 4.0.2__tar.gz

{hdx_python_utilities-4.0.1 → hdx_python_utilities-4.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hdx-python-utilities
-Version: 4.0.1
+Version: 4.0.2
 Summary: HDX Python Utilities for streaming tabular data, date and time handling and other helpful functions
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-utilities
 Author-email: Michael Rans <rans@email.com>

{hdx_python_utilities-4.0.1 → hdx_python_utilities-4.0.2}/src/hdx/utilities/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.0.1'
-__version_tuple__ = version_tuple = (4, 0, 1)
+__version__ = version = '4.0.2'
+__version_tuple__ = version_tuple = (4, 0, 2)
 
 __commit_id__ = commit_id = None

{hdx_python_utilities-4.0.1 → hdx_python_utilities-4.0.2}/src/hdx/utilities/downloader.py

@@ -65,7 +65,7 @@ class Download(BaseDownload):
     def __init__(
         self,
         user_agent: str | None = None,
-        user_agent_config_yaml: str | None = None,
+        user_agent_config_yaml: Path | str | None = None,
         user_agent_lookup: str | None = None,
         use_env: bool = True,
         fail_on_missing_file: bool = True,
@@ -1279,7 +1279,7 @@ class Download(BaseDownload):
         cls,
         custom_configs: dict[str, dict],
         user_agent: str | None = None,
-        user_agent_config_yaml: str | None = None,
+        user_agent_config_yaml: Path | str | None = None,
         user_agent_lookup: str | None = None,
         use_env: bool = True,
         fail_on_missing_file: bool = True,

{hdx_python_utilities-4.0.1 → hdx_python_utilities-4.0.2}/src/hdx/utilities/email.py

@@ -5,7 +5,8 @@ import smtplib
 from collections.abc import Sequence
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
-from os.path import expanduser, join
+from os.path import expanduser
+from pathlib import Path
 from typing import Any
 
 from hdx.utilities.loader import load_json, load_yaml
@@ -45,7 +46,7 @@ class Email:
         email_config_yaml (str): Path to YAML HDX configuration. Defaults to ~/hdx_email_configuration.yaml.
     """
 
-    default_email_config_yaml = join(expanduser("~"), "hdx_email_configuration.yaml")
+    default_email_config_yaml = Path(expanduser("~")) / "hdx_email_configuration.yaml"
 
     def __init__(self, **kwargs: Any) -> None:
         email_config_found = False

{hdx_python_utilities-4.0.1 → hdx_python_utilities-4.0.2}/src/hdx/utilities/html.py

@@ -1,6 +1,7 @@
 """HTML parsing utilities."""
 
 import logging
+from pathlib import Path
 from typing import Any
 
 try:
@@ -20,7 +21,7 @@ if BeautifulSoup is not None:
         url: str,
         downloader: Download = None,
         user_agent: str | None = None,
-        user_agent_config_yaml: str | None = None,
+        user_agent_config_yaml: Path | str | None = None,
         user_agent_lookup: str | None = None,
         **kwargs: Any,
     ) -> BeautifulSoup:

{hdx_python_utilities-4.0.1 → hdx_python_utilities-4.0.2}/src/hdx/utilities/session.py

@@ -2,6 +2,7 @@
 
 import logging
 import os
+from pathlib import Path
 from typing import Any
 
 import requests
@@ -22,7 +23,7 @@ class SessionError(Exception):
 
 def get_session(
     user_agent: str | None = None,
-    user_agent_config_yaml: str | None = None,
+    user_agent_config_yaml: Path | str | None = None,
     user_agent_lookup: str | None = None,
     use_env: bool = True,
     fail_on_missing_file: bool = True,

{hdx_python_utilities-4.0.1 → hdx_python_utilities-4.0.2}/src/hdx/utilities/useragent.py

@@ -2,7 +2,8 @@
 
 import logging
 import os
-from os.path import expanduser, isfile, join
+from os.path import expanduser
+from pathlib import Path
 from typing import Any
 
 from hdx.utilities import __version__
@@ -16,7 +17,7 @@ class UserAgentError(Exception):
 
 
 class UserAgent:
-    default_user_agent_config_yaml = join(expanduser("~"), ".useragent.yaml")
+    default_user_agent_config_yaml = Path(expanduser("~")) / ".useragent.yaml"
     user_agent = None
 
     @staticmethod
@@ -68,7 +69,7 @@ class UserAgent:
     def _load(
         cls,
         prefix: str,
-        user_agent_config_yaml: str,
+        user_agent_config_yaml: Path | str,
         user_agent_lookup: str | None = None,
     ) -> str:
         """Load user agent YAML file.
@@ -83,9 +84,9 @@ class UserAgent:
         """
         if not user_agent_config_yaml:
             user_agent_config_yaml = cls.default_user_agent_config_yaml
-            if not isfile(user_agent_config_yaml):
-                user_agent_config_yaml = user_agent_config_yaml.replace(".yaml", ".yml")
-            if isfile(user_agent_config_yaml):
+            if not user_agent_config_yaml.is_file():
+                user_agent_config_yaml = user_agent_config_yaml.with_suffix(".yml")
+            if user_agent_config_yaml.is_file():
                 logger.info(
                     f"No user agent or user agent config file given. Using default user agent config file: {user_agent_config_yaml}."
                 )
@@ -108,7 +109,7 @@ class UserAgent:
     def _create(
         cls,
         user_agent: str | None = None,
-        user_agent_config_yaml: str | None = None,
+        user_agent_config_yaml: Path | str | None = None,
         user_agent_lookup: str | None = None,
         **kwargs: Any,
     ) -> str:
@@ -146,7 +147,7 @@ class UserAgent:
     def set_global(
         cls,
         user_agent: str | None = None,
-        user_agent_config_yaml: str | None = None,
+        user_agent_config_yaml: Path | str | None = None,
         user_agent_lookup: str | None = None,
         **kwargs: Any,
     ) -> None:
@@ -168,7 +169,7 @@ class UserAgent:
     def get(
         cls,
         user_agent: str | None = None,
-        user_agent_config_yaml: str | None = None,
+        user_agent_config_yaml: Path | str | None = None,
         user_agent_lookup: str | None = None,
         **kwargs: Any,
     ) -> str: