From 18800da0943ed163325747d2b25ae334daba5e90 Mon Sep 17 00:00:00 2001 From: Constantin Neagu Date: Fri, 25 Jul 2025 16:03:57 +0200 Subject: [PATCH 1/2] Add type check when creating a new MerginProject --- mergin/merginproject.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mergin/merginproject.py b/mergin/merginproject.py index 83d8510a..97a5e4c4 100644 --- a/mergin/merginproject.py +++ b/mergin/merginproject.py @@ -42,6 +42,8 @@ class MerginProject: """ def __init__(self, directory): + if not isinstance(directory, str): + raise ClientError("'directory' must be a str") self.dir = os.path.abspath(directory) if not os.path.exists(self.dir): raise InvalidProject("Project directory does not exist") From c18b3a1d3f249e01d56828c9c9b0386e40c45e5f Mon Sep 17 00:00:00 2001 From: Constantin Neagu Date: Mon, 28 Jul 2025 16:26:55 +0200 Subject: [PATCH 2/2] Support pathlib.Path objects when initializing a MerginProject --- mergin/merginproject.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mergin/merginproject.py b/mergin/merginproject.py index 97a5e4c4..a82f5796 100644 --- a/mergin/merginproject.py +++ b/mergin/merginproject.py @@ -42,8 +42,6 @@ class MerginProject: """ def __init__(self, directory): - if not isinstance(directory, str): - raise ClientError("'directory' must be a str") self.dir = os.path.abspath(directory) if not os.path.exists(self.dir): raise InvalidProject("Project directory does not exist") @@ -88,7 +86,7 @@ def _logger_callback(level, text_bytes): def setup_logging(self, logger_name): """Setup logging into project directory's .mergin/client-log.txt file.""" - self.log = logging.getLogger("mergin.project." + logger_name) + self.log = logging.getLogger("mergin.project." + str(logger_name)) self.log.setLevel(logging.DEBUG) # log everything (it would otherwise log just warnings+errors) if not self.log.handlers: # we only need to set the handler once