diff -Nru pep8-1.7.1/debian/changelog pep8-1.7.1/debian/changelog
--- pep8-1.7.1/debian/changelog	2018-02-08 14:49:47.000000000 +0000
+++ pep8-1.7.1/debian/changelog	2018-11-05 02:39:14.000000000 +0000
@@ -1,3 +1,10 @@
+pep8 (1.7.1-1ubuntu2) disco; urgency=medium
+
+  * d/patches/python3.7-compat.diff: Fix FutureWarning on running pep8 and a
+    test failure from tokenize.py changes.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Mon, 05 Nov 2018 15:39:14 +1300
+
 pep8 (1.7.1-1ubuntu1) bionic; urgency=medium
 
   * Allow stderr output in the autopkg tests (deprecation warning).
diff -Nru pep8-1.7.1/debian/control pep8-1.7.1/debian/control
--- pep8-1.7.1/debian/control	2017-10-30 08:20:55.000000000 +0000
+++ pep8-1.7.1/debian/control	2018-11-05 02:39:14.000000000 +0000
@@ -2,7 +2,8 @@
 Section: python
 Priority: optional
 Uploaders: David Watson <dwatson@debian.org>, Sylvestre Ledru <sylvestre@debian.org>
-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Build-Depends: debhelper (>= 9),
  dh-python,
  python-all,
diff -Nru pep8-1.7.1/debian/patches/python3.7-compat.diff pep8-1.7.1/debian/patches/python3.7-compat.diff
--- pep8-1.7.1/debian/patches/python3.7-compat.diff	1970-01-01 00:00:00.000000000 +0000
+++ pep8-1.7.1/debian/patches/python3.7-compat.diff	2018-11-05 02:39:14.000000000 +0000
@@ -0,0 +1,24 @@
+--- a/pep8.py
++++ b/pep8.py
+@@ -107,7 +107,7 @@
+ RERAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*,.*,\s*\w+\s*$')
+ ERRORCODE_REGEX = re.compile(r'\b[A-Z]\d{3}\b')
+ DOCSTRING_REGEX = re.compile(r'u?r?["\']')
+-EXTRANEOUS_WHITESPACE_REGEX = re.compile(r'[[({] | []}),;:]')
++EXTRANEOUS_WHITESPACE_REGEX = re.compile(r'[\[({] | [\]}),;:]')
+ WHITESPACE_AFTER_COMMA_REGEX = re.compile(r'[,;:]\s*(?:  |\t)')
+ COMPARE_SINGLETON_REGEX = re.compile(r'(\bNone|\bFalse|\bTrue)?\s*([=!]=)'
+                                      r'\s*(?(1)|(None|False|True))\b')
+@@ -190,10 +190,10 @@
+     """
+     if line_number == total_lines:
+         stripped_last_line = physical_line.rstrip()
+-        if not stripped_last_line:
++        if physical_line and not stripped_last_line:
+             return 0, "W391 blank line at end of file"
+         if stripped_last_line == physical_line:
+-            return len(physical_line), "W292 no newline at end of file"
++            return len(lines[-1]), "W292 no newline at end of file"
+ 
+ 
+ def maximum_line_length(physical_line, max_line_length, multiline):
diff -Nru pep8-1.7.1/debian/patches/series pep8-1.7.1/debian/patches/series
--- pep8-1.7.1/debian/patches/series	2017-10-30 08:20:55.000000000 +0000
+++ pep8-1.7.1/debian/patches/series	2018-11-05 02:38:43.000000000 +0000
@@ -1 +1,2 @@
 silent-warning-pycodestyle.diff
+python3.7-compat.diff