Refs #70 Fix unittests for whitelist_subject and free_mail

SpamExperts · Jan 26, 2017 · 7b6804a · 7b6804a
1 parent 3194f8f
commit 7b6804a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pad/plugins/free_mail.py b/pad/plugins/free_mail.py
@@ -247,7 +247,7 @@ def check_freemail_header(self, msg, header, regex=None, target=None):
             return False
         if regex:
             try:
-                check_re = Regex(regex)
+                check_re = Regex(regex).compile()
             except re.error:
                 self.ctxt.log.warn("FreeMail::Plugin check_freemail_header"
                                    " regex error")
@@ -300,7 +300,7 @@ def check_freemail_body(self, msg, regex=None, target=None):
             return False
         if regex:
             try:
-                check_re = Regex(regex)
+                check_re = Regex(regex).compile()
             except re.error:
                 self.ctxt.log.warn("FreeMail::Plugin check_freemail_from"
                                    " regex error")

diff --git a/pad/plugins/whitelist_subject.py b/pad/plugins/whitelist_subject.py
@@ -27,7 +27,7 @@ def parse_config(self, key, value):
         # Need to check if the option is a valid regular expression.
         if key in self.options:
             try:
-                Regex(value.strip())
+                Regex(value.strip()).compile()
             except re.error:
                 return
             self.set_append_option(key, value)