Deprecate any arnied wrapper cnfvar functionality

[pyi2ncommon] / src / mail_utils.py

diff --git a/src/mail_utils.py b/src/mail_utils.py
index 9dc1699..64759a4 100644 (file)
--- a/src/mail_utils.py
+++ b/src/mail_utils.py
@@ -45,6 +45,7 @@ from email import policy
 # outsourced source, import required for compatiblity
 from .imap_mailbox import ImapMailbox           # pylint: disable=unused-import
 from .mail_validator import *                   # pylint: disable=unused-import
+from .sysmisc import replace_file_regex
 
 log = logging.getLogger('pyi2ncommon.mail_utils')
 
@@ -66,10 +67,7 @@ def prep_email_header(email_file, value, regex=None, criterion="envelopeto"):
     """
     if criterion == "envelopeto":
         logging.debug("Updating test emails' EnvelopeTo header")
-        # TODO: the cnf value prep function from the arnied wrapper could be
-        # generalized to a shared regex replacement function e.g. in sysmisc
-        from . import arnied_wrapper
-        arnied_wrapper.prep_cnf_value(email_file, value, regex=regex)
+        replace_file_regex(email_file, value, regex=regex)
     elif criterion == "received":
         logging.debug("Updating test emails' Received header")
         with open(email_file, "r") as file_handle: