aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--patchwork/parser.py1
-rw-r--r--patchwork/tests/test_parser.py2
-rw-r--r--releasenotes/notes/issue-273-2bb8d2bf5fa9a57e.yaml8
3 files changed, 9 insertions, 2 deletions
diff --git a/patchwork/parser.py b/patchwork/parser.py
index 712780a..91e9920 100644
--- a/patchwork/parser.py
+++ b/patchwork/parser.py
@@ -47,7 +47,6 @@ class DuplicateMailError(Exception):
def normalise_space(value):
- value = ''.join(re.split(r'\n\s+', value))
whitespace_re = re.compile(r'\s+')
return whitespace_re.sub(' ', value).strip()
diff --git a/patchwork/tests/test_parser.py b/patchwork/tests/test_parser.py
index ddbcf5b..f182202 100644
--- a/patchwork/tests/test_parser.py
+++ b/patchwork/tests/test_parser.py
@@ -838,7 +838,7 @@ class SubjectTest(TestCase):
self.assertEqual(clean_subject("[PATCH] meep \n meep"),
('meep meep', []))
self.assertEqual(clean_subject("[PATCH] meep,\n meep"),
- ('meep,meep', []))
+ ('meep, meep', []))
self.assertEqual(clean_subject('[PATCH RFC] meep'),
('[RFC] meep', ['RFC']))
self.assertEqual(clean_subject('[PATCH,RFC] meep'),
diff --git a/releasenotes/notes/issue-273-2bb8d2bf5fa9a57e.yaml b/releasenotes/notes/issue-273-2bb8d2bf5fa9a57e.yaml
new file mode 100644
index 0000000..506de0d
--- /dev/null
+++ b/releasenotes/notes/issue-273-2bb8d2bf5fa9a57e.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+ - |
+ `#197`__ was the result of a issue with OzLabs instance and not Patchwork
+ itself, and the fix included actually ended up corrupting subjects for
+ everyone. It has now been reverted.
+
+ __ https://github.com/getpatchwork/patchwork/issues/197