summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2008-09-16 20:06:54 +1000
committerJeremy Kerr <jk@ozlabs.org>2008-09-16 20:06:54 +1000
commitae13beca83bcd061d7b0158ed4bdd45abf2eb855 (patch)
treebe54fed80a180ec45dbfd3a6e35135abc5173e13 /apps
parentf21a92596f97dd093f693a4cc89577aacbe164cb (diff)
downloadpatchwork-ae13beca83bcd061d7b0158ed4bdd45abf2eb855.tar.bz2
patchwork-ae13beca83bcd061d7b0158ed4bdd45abf2eb855.tar.xz
Fix handling of newlines in subjects
By doing two passes of whitespace normalisation Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'apps')
-rwxr-xr-xapps/patchwork/bin/parsemail.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/patchwork/bin/parsemail.py b/apps/patchwork/bin/parsemail.py
index b679894..3fbe473 100755
--- a/apps/patchwork/bin/parsemail.py
+++ b/apps/patchwork/bin/parsemail.py
@@ -240,6 +240,8 @@ def clean_subject(subject, drop_prefixes = None):
'meep'
>>> clean_subject('[PATCH] meep')
'meep'
+ >>> clean_subject('[PATCH] meep \\n meep')
+ 'meep meep'
>>> clean_subject('[PATCH RFC] meep')
'[RFC] meep'
>>> clean_subject('[PATCH,RFC] meep')
@@ -274,6 +276,9 @@ def clean_subject(subject, drop_prefixes = None):
# remove Re:, Fwd:, etc
subject = re_re.sub(' ', subject)
+ # normalise whitespace
+ subject = whitespace_re.sub(' ', subject)
+
prefixes = []
match = prefix_re.match(subject)