summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Finucane <stephen@that.guru>2020-04-09 18:00:57 +0100
committerStephen Finucane <stephen@that.guru>2020-04-09 18:01:14 +0100
commite15fc9fef64ba8cfd4f5f5c3c74135caef0ebfa7 (patch)
tree2a1be57e6e344bc750551185b169842f5422bfb6
parentf71f5ee115ed23054acb759cd48d1d564cd54bd0 (diff)
downloadpatchwork-e15fc9fef64ba8cfd4f5f5c3c74135caef0ebfa7.tar
patchwork-e15fc9fef64ba8cfd4f5f5c3c74135caef0ebfa7.tar.gz
Additional Python 2.7 cleanups
Signed-off-by: Stephen Finucane <stephen@that.guru>
-rw-r--r--README.rst2
-rw-r--r--docs/deployment/installation.rst4
-rw-r--r--patchwork/parser.py4
3 files changed, 2 insertions, 8 deletions
diff --git a/README.rst b/README.rst
index 2f89b00..7af45ce 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 cef522c..6681002 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 4c2d51d..a09fd75 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)