From: Jeremy Kerr <jk@ozlabs.org>
Date: Tue, 16 Sep 2008 10:06:54 +0000 (+1000)
Subject: Fix handling of newlines in subjects
X-Git-Tag: v0.9.0~305
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae13beca83bcd061d7b0158ed4bdd45abf2eb855;p=thirdparty%2Fpatchwork.git

Fix handling of newlines in subjects

By doing two passes of whitespace normalisation

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---

diff --git a/apps/patchwork/bin/parsemail.py b/apps/patchwork/bin/parsemail.py
index b679894f..3fbe4735 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)