1 files changed, 0 insertions, 101 deletions
diff --git a/Mailman/app/bounces.py b/Mailman/app/bounces.py
index 6df5c8aa6..3f38cbf67 100644
--- a/Mailman/app/bounces.py
+++ b/Mailman/app/bounces.py
@@ -19,8 +19,6 @@
 
 __all__ = [
     'bounce_message',
-    'has_explicit_destination',
-    'has_matching_bounce_header',
     ]
 
 import re
@@ -62,102 +60,3 @@ def bounce_message(mlist, msg, e=None):
     bmsg.attach(txt)
     bmsg.attach(MIMEMessage(msg))
     bmsg.send(mlist)
-
-
-
-# Helper function used to match a pattern against an address.
-def _domatch(pattern, addr):
-    try:
-        if re.match(pattern, addr, re.IGNORECASE):
-            return True
-    except re.error:
-        # The pattern is a malformed regexp -- try matching safely,
-        # with all non-alphanumerics backslashed:
-        if re.match(re.escape(pattern), addr, re.IGNORECASE):
-            return True
-    return False
-
-
-def has_explicit_destination(mlist, msg):
-    """Does the list's name or an acceptable alias appear in the recipients?
-
-    :param mlist: The mailing list the message is destined for.
-    :param msg: The email message object.
-    :return: True if the message is explicitly destined for the mailing list,
-        otherwise False.
-    """
-    # Check all recipient addresses against the list's explicit addresses,
-    # specifically To: Cc: and Resent-to:
-    recipients = []
-    to = []
-    for header in ('to', 'cc', 'resent-to', 'resent-cc'):
-        to.extend(getaddresses(msg.get_all(header, [])))
-    for fullname, address in to:
-        # It's possible that if the header doesn't have a valid RFC 2822
-        # value, we'll get None for the address.  So skip it.
-        if address is None or '@' not in address:
-            continue
-        address = address.lower()
-        if address == mlist.posting_address:
-            return True
-        recipients.append(address)
-    # Match the set of recipients against the list's acceptable aliases.
-    aliases = mlist.acceptable_aliases.splitlines()
-    for address in recipients:
-        for alias in aliases:
-            stripped = alias.strip()
-            if not stripped:
-                # Ignore blank or empty lines
-                continue
-            if domatch(stripped, address):
-                return True
-    return False
-
-
-
-def _parse_matching_header_opt(mlist):
-    """Return a list of triples [(field name, regex, line), ...]."""
-    # - Blank lines and lines with '#' as first char are skipped.
-    # - Leading whitespace in the matchexp is trimmed - you can defeat
-    #   that by, eg, containing it in gratuitous square brackets.
-    all = []
-    for line in mlist.bounce_matching_headers.splitlines():
-        line = line.strip()
-        # Skip blank lines and lines *starting* with a '#'.
-        if not line or line.startswith('#'):
-            continue
-        i = line.find(':')
-        if i < 0:
-            # This didn't look like a header line.  BAW: should do a
-            # better job of informing the list admin.
-            log.error('bad bounce_matching_header line: %s\n%s',
-                      mlist.real_name, line)
-        else:
-            header = line[:i]
-            value = line[i+1:].lstrip()
-            try:
-                cre = re.compile(value, re.IGNORECASE)
-            except re.error, e:
-                # The regexp was malformed.  BAW: should do a better
-                # job of informing the list admin.
-                log.error("""\
-bad regexp in bounce_matching_header line: %s
-\n%s (cause: %s)""", mlist.real_name, value, e)
-            else:
-                all.append((header, cre, line))
-    return all
-
-
-def has_matching_bounce_header(mlist, msg):
-    """Does the message have a matching bounce header?
-
-    :param mlist: The mailing list the message is destined for.
-    :param msg: The email message object.
-    :return: True if a header field matches a regexp in the
-        bounce_matching_header mailing list variable.
-    """
-    for header, cre, line in _parse_matching_header_opt(mlist):
-        for value in msg.get_all(header, []):
-            if cre.search(value):
-                return True
-    return False