From: Stephen Finucane <stephen@that.guru>
Date: Thu, 9 Apr 2020 17:00:57 +0000 (+0100)
Subject: Additional Python 2.7 cleanups
X-Git-Tag: v3.0.0~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e15fc9fef64ba8cfd4f5f5c3c74135caef0ebfa7;p=thirdparty%2Fpatchwork.git

Additional Python 2.7 cleanups

Signed-off-by: Stephen Finucane <stephen@that.guru>
---

diff --git a/README.rst b/README.rst
index 2f89b000..7af45ce7 100644
--- a/README.rst
+++ b/README.rst
@@ -39,7 +39,7 @@ Requirements
 
 Patchwork requires reasonably recent versions of:
 
-- Python (2 or 3)
+- Python 3
 
 - Django
 
diff --git a/docs/deployment/installation.rst b/docs/deployment/installation.rst
index cef522c6..6681002f 100644
--- a/docs/deployment/installation.rst
+++ b/docs/deployment/installation.rst
@@ -44,9 +44,7 @@ Requirements
 For the purpose of this guide, we will assume an **Ubuntu 18.04** host:
 commands, package names and/or package versions will likely change if using a
 different distro or release. Similarly, usage of different package versions to
-the ones suggested may require slightly different configuration. For example,
-this guide describes configuration with **Python 3** and using Python 2 will
-require different packages and some minor changes to configuration files.
+the ones suggested may require slightly different configuration.
 
 Before beginning, you should update and restart this system:
 
diff --git a/patchwork/parser.py b/patchwork/parser.py
index 4c2d51d6..a09fd754 100644
--- a/patchwork/parser.py
+++ b/patchwork/parser.py
@@ -765,11 +765,7 @@ def clean_content(content):
     """Remove cruft from the email message.
 
     Catch signature (-- ) and list footer (_____) cruft.
-
-    Change to Unix line endings (the Python 3 email module does this for us,
-    but not Python 2).
     """
-    content = content.replace('\r\n', '\n')
     sig_re = re.compile(r'^(-- |_+)\n.*', re.S | re.M)
     content = sig_re.sub('', content)