[incubator-ponymail-foal] branch master updated: Don't use assert for input errors

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
     new 637cec6  Don't use assert for input errors
637cec6 is described below

commit 637cec653f6b640c1c4e62658ab8f1cd6a1feec5
Author: Sebb <s...@apache.org>
AuthorDate: Thu Nov 18 22:42:58 2021 +0000

    Don't use assert for input errors
    
    This relates to #87
---
 tools/archiver.py    | 6 ++++--
 tools/import-mbox.py | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/archiver.py b/tools/archiver.py
index 3ef6a49..8256fac 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -443,7 +443,8 @@ class Archiver(object):  # N.B. Also used by import-mbox.py
 
         if not lid:
             lid = textlib.normalize_lid(msg.get("list-id"), strict=True)
-            assert lid is not None, f"Invalid list-id {lid} provided"
+            if lid is None:
+                raise ValueError(f"Invalid list-id {lid} provided")
         if self.cropout:
             crops = self.cropout.split(" ")
             # Regex replace?
@@ -632,7 +633,8 @@ class Archiver(object):  # N.B. Also used by import-mbox.py
         """
 
         lid = textlib.normalize_lid(mlist.list_id, strict=True)
-        assert lid is not None, f"Invalid list id {lid}"
+        if lid is None:
+            raise ValueError(f"Invalid list id {lid}")
 
         private = False
         if hasattr(mlist, "archive_public") and mlist.archive_public is True:
diff --git a/tools/import-mbox.py b/tools/import-mbox.py
index e2cf540..f53821d 100755
--- a/tools/import-mbox.py
+++ b/tools/import-mbox.py
@@ -575,7 +575,8 @@ if args.dir:
     maildir = args.dir
 if args.listid:
     list_override = textlib.normalize_lid(args.listid[0], strict=True)
-    assert list_override is not None, "Invalid list-ID provided"
+    if list_override is None:
+        raise ValueError("Invalid list-ID provided")
 if args.project:
     project = args.project[0]
 if args.domain: