From 5067c406b2d6f9d5bbcabceed73f7aa0fcb64f91 Mon Sep 17 00:00:00 2001 From: JustAnotherArchivist Date: Thu, 4 Jun 2020 17:42:17 +0000 Subject: [PATCH] Fix errors on invalid filter or sort values --- archivebot-jobs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archivebot-jobs b/archivebot-jobs index c3ba882..3cf996d 100755 --- a/archivebot-jobs +++ b/archivebot-jobs @@ -40,7 +40,7 @@ class FilterAction(argparse.Action): global columns match = re.match(r"^(?P[A-Za-z ]+)(?P[=<>^*$~])(?P.*)$", values[0]) if not match: - raise argparse.ArgumentError('Invalid filter') + parser.error('Invalid filter') filterDict = match.groupdict() filterDict["column"] = filterDict["column"].lower() assert filterDict["column"] in columns @@ -54,7 +54,7 @@ def parse_sort(value): value = value[1:] value = value.lower() if value not in columns: - raise argparse.ArgumentError('Invalid column name') + parser.error('Invalid column name') return (value, sortDesc) class SortAction(argparse.Action):