Skip to content

Commit e15fc9f

Browse files
committed
Additional Python 2.7 cleanups
Signed-off-by: Stephen Finucane <stephen@that.guru>
1 parent f71f5ee commit e15fc9f

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Requirements
3939

4040
Patchwork requires reasonably recent versions of:
4141

42-
- Python (2 or 3)
42+
- Python 3
4343

4444
- Django
4545

docs/deployment/installation.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ Requirements
4444
For the purpose of this guide, we will assume an **Ubuntu 18.04** host:
4545
commands, package names and/or package versions will likely change if using a
4646
different distro or release. Similarly, usage of different package versions to
47-
the ones suggested may require slightly different configuration. For example,
48-
this guide describes configuration with **Python 3** and using Python 2 will
49-
require different packages and some minor changes to configuration files.
47+
the ones suggested may require slightly different configuration.
5048

5149
Before beginning, you should update and restart this system:
5250

patchwork/parser.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -765,11 +765,7 @@ def clean_content(content):
765765
"""Remove cruft from the email message.
766766
767767
Catch signature (-- ) and list footer (_____) cruft.
768-
769-
Change to Unix line endings (the Python 3 email module does this for us,
770-
but not Python 2).
771768
"""
772-
content = content.replace('\r\n', '\n')
773769
sig_re = re.compile(r'^(-- |_+)\n.*', re.S | re.M)
774770
content = sig_re.sub('', content)
775771

0 commit comments

Comments
 (0)