upgrade deps, run tests on more live snakes

Author: graingert

.travis.yml

@@ -3,14 +3,21 @@ language: python
 python: "3.5"
 env:
   - TOX_ENV=py27
-  - TOX_ENV=py33
   - TOX_ENV=py34
   - TOX_ENV=py35
-  - TOX_ENV=lint
 matrix:
   include:
     - python: 3.6
       env: TOX_ENV=py36
+  include:
+    - python: 3.7
+      env: TOX_ENV=py37
+  include:
+    - python: 3.7
+      env: TOX_ENV=lint
+  include:
+    - python: 2.7
+      env: TOX_ENV=lint
 addons:
     apt:
         packages:

setup.py

@@ -39,10 +39,9 @@
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6"
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
     ],
 )
-

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,33,34,35,36}, lint
+envlist = py{27,34,35,36,37}, lint
 
 [testenv]
 commands = nosetests --with-doctest --doctest-extension=rst {posargs}
@@ -8,5 +8,5 @@ deps =
 
 [testenv:lint]
 deps =
-    flake8==3.3.0
-commands=flake8 whatthepatch tests
+    flake8==3.7.7
+commands=flake8 whatthepatch tests setup.py

whatthepatch/apply.py

@@ -101,17 +101,15 @@ def apply_diff(diff, text, reverse=False, use_patch=False):
         if old is not None and line is not None:
             if old > n_lines:
                 raise exceptions.HunkApplyException(
-                    'context line {n}, "{l}" does not exist in source'.format(
-                        n=old,
-                        l=line,
-                    ),
+                    'context line {n}, "{line}" does not exist in source'
+                    .format(n=old, line=line),
                     hunk=hunk,
                 )
             if lines[old-1] != line:
                 raise exceptions.HunkApplyException(
-                    'context line {n}, "{l}" does not match "{sl}"'.format(
+                    'context line {n}, "{line}" does not match "{sl}"'.format(
                         n=old,
-                        l=line,
+                        line=line,
                         sl=lines[old-1]
                     ),
                     hunk=hunk,

whatthepatch/patch.py

@@ -20,35 +20,35 @@
 # general diff regex
 diffcmd_header = re.compile('^diff.* (.+) (.+)$')
 unified_header_index = re.compile('^Index: (.+)$')
-unified_header_old_line = re.compile('^--- ' + file_timestamp_str + '$')
-unified_header_new_line = re.compile('^\+\+\+ ' + file_timestamp_str + '$')
-unified_hunk_start = re.compile('^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@(.*)$')
+unified_header_old_line = re.compile(r'^--- ' + file_timestamp_str + '$')
+unified_header_new_line = re.compile(r'^\+\+\+ ' + file_timestamp_str + '$')
+unified_hunk_start = re.compile(r'^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@(.*)$')
 unified_change = re.compile('^([-+ ])(.*)$')
 
-context_header_old_line = re.compile('^\*\*\* ' + file_timestamp_str + '$')
+context_header_old_line = re.compile(r'^\*\*\* ' + file_timestamp_str + '$')
 context_header_new_line = re.compile('^--- ' + file_timestamp_str + '$')
-context_hunk_start = re.compile('^\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*$')
-context_hunk_old = re.compile('^\*\*\* (\d+),?(\d*) \*\*\*\*$')
-context_hunk_new = re.compile('^--- (\d+),?(\d*) ----$')
+context_hunk_start = re.compile(r'^\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*$')
+context_hunk_old = re.compile(r'^\*\*\* (\d+),?(\d*) \*\*\*\*$')
+context_hunk_new = re.compile(r'^--- (\d+),?(\d*) ----$')
 context_change = re.compile('^([-+ !]) (.*)$')
 
-ed_hunk_start = re.compile('^(\d+),?(\d*)([acd])$')
+ed_hunk_start = re.compile(r'^(\d+),?(\d*)([acd])$')
 ed_hunk_end = re.compile('^.$')
 # much like forward ed, but no 'c' type
-rcs_ed_hunk_start = re.compile('^([ad])(\d+) ?(\d*)$')
+rcs_ed_hunk_start = re.compile(r'^([ad])(\d+) ?(\d*)$')
 
-default_hunk_start = re.compile('^(\d+),?(\d*)([acd])(\d+),?(\d*)$')
+default_hunk_start = re.compile(r'^(\d+),?(\d*)([acd])(\d+),?(\d*)$')
 default_hunk_mid = re.compile('^---$')
 default_change = re.compile('^([><]) (.*)$')
 
 # Headers
 
 # git has a special index header and no end part
 git_diffcmd_header = re.compile('^diff --git a/(.+) b/(.+)$')
-git_header_index = re.compile('^index ([a-f0-9]+)..([a-f0-9]+) ?(\d*)$')
+git_header_index = re.compile(r'^index ([a-f0-9]+)..([a-f0-9]+) ?(\d*)$')
 git_header_old_line = re.compile('^--- (.+)$')
-git_header_new_line = re.compile('^\+\+\+ (.+)$')
-git_header_file_mode = re.compile('^(new|deleted) file mode \d{6}$')
+git_header_new_line = re.compile(r'^\+\+\+ (.+)$')
+git_header_file_mode = re.compile(r'^(new|deleted) file mode \d{6}$')
 git_header_binary_file = re.compile('^Binary files (.+) and (.+) differ')
 
 bzr_header_index = re.compile("=== (.+)")
@@ -57,14 +57,14 @@
 
 svn_header_index = unified_header_index
 svn_header_timestamp_version = re.compile(
-    '\((?:working copy|revision (\d+))\)'
+    r'\((?:working copy|revision (\d+))\)'
 )
-svn_header_timestamp = re.compile('.*(\(.*\))$')
+svn_header_timestamp = re.compile(r'.*(\(.*\))$')
 
 cvs_header_index = unified_header_index
-cvs_header_rcs = re.compile('^RCS file: (.+)(?:,\w{1}$|$)')
-cvs_header_timestamp = re.compile('(.+)\t([\d.]+)')
-cvs_header_timestamp_colon = re.compile(':([\d.]+)\t(.+)')
+cvs_header_rcs = re.compile(r'^RCS file: (.+)(?:,\w{1}$|$)')
+cvs_header_timestamp = re.compile(r'(.+)\t([\d.]+)')
+cvs_header_timestamp_colon = re.compile(r':([\d.]+)\t(.+)')
 old_cvs_diffcmd_header = re.compile('^diff.* (.+):(.*) (.+):(.*)$')