diff options
| author | Tokio Kikuchi <tkikuchi@is.kochi-u.ac.jp> | 2007-11-16 11:48:35 +0900 |
|---|---|---|
| committer | Tokio Kikuchi <tkikuchi@is.kochi-u.ac.jp> | 2007-11-16 11:48:35 +0900 |
| commit | 8f5d8d2eb9e8bf62a598f126419d18eb3163050e (patch) | |
| tree | e9dd5c5e73bed1b75811ff7614ba6489c2cd48f1 /Mailman/Queue | |
| parent | ba98caf52c18dea4ea244c092617677bdbb01015 (diff) | |
| parent | 70689d7eb61f8c852a6a02be1d65c86cde06bde2 (diff) | |
| download | mailman2-8f5d8d2eb9e8bf62a598f126419d18eb3163050e.tar.gz mailman2-8f5d8d2eb9e8bf62a598f126419d18eb3163050e.tar.xz mailman2-8f5d8d2eb9e8bf62a598f126419d18eb3163050e.zip | |
merge and commit
Diffstat (limited to 'Mailman/Queue')
| -rw-r--r-- | Mailman/Queue/CommandRunner.py | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | Mailman/Queue/MaildirRunner.py | 20 |
2 files changed, 18 insertions, 6 deletions
diff --git a/Mailman/Queue/CommandRunner.py b/Mailman/Queue/CommandRunner.py index e08d02eb..5920b89f 100644 --- a/Mailman/Queue/CommandRunner.py +++ b/Mailman/Queue/CommandRunner.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2004 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2007 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -93,7 +93,7 @@ class Results: if part is None: # E.g the outer Content-Type: was text/html return - body = part.get_payload() + body = part.get_payload(decode=True) # text/plain parts better have string payloads assert isinstance(body, StringType) or isinstance(body, UnicodeType) lines = body.splitlines() diff --git a/Mailman/Queue/MaildirRunner.py b/Mailman/Queue/MaildirRunner.py index 39971ae2..d9fe02cb 100644..100755 --- a/Mailman/Queue/MaildirRunner.py +++ b/Mailman/Queue/MaildirRunner.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2007 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -12,7 +12,8 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. """Maildir pre-queue runner. @@ -66,11 +67,22 @@ from Mailman.Logging.Syslog import syslog # listname-request@ lre = re.compile(r""" ^ # start of string - (?P<listname>[^-@]+) # listname@ or listname-subq@ + (?P<listname>[^+@]+?) # listname@ or listname-subq@ (non-greedy) (?: # non-grouping - # dash separator - (?P<subq>[^-+@]+) # everything up to + or - or @ + (?P<subq> # any known suffix + admin| + bounces| + confirm| + join| + leave| + owner| + request| + subscribe| + unsubscribe + ) )? # if it exists + [+@] # followed by + or @ """, re.VERBOSE | re.IGNORECASE) |