From 94bf501cf31b5a553ee347c5377a284c090e5e60 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Mon, 27 Apr 2020 11:16:33 +0200
Subject: [PATCH] Migrate pep8 to pycodestyle

---
 .gitlab-ci.yml               | 2 +-
 Dockerfile                   | 2 +-
 rplugin/python3/neotags.py   | 6 +++---
 rplugin/test/test_neotags.py | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10917e8..9a9f8f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ lint:coding-guideline:
   image: 'registry.gitlab.com/danielsiepmann/neotags:latest'
   stage: test
   script:
-    - pep8 .
+    - pycodestyle --show-source --show-pep8 .
 
 test:
   image: 'registry.gitlab.com/danielsiepmann/neotags:latest'
diff --git a/Dockerfile b/Dockerfile
index cd7049c..b673e0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,4 +5,4 @@ LABEL Description="This image should provide environment to lint neotags" Vendor
 
 # Install dependencies
 RUN pip install --upgrade pip
-RUN pip install --no-cache-dir pep8 pynvim pyfakefs==3.1
+RUN pip install --no-cache-dir pycodestyle==2.5.0 pynvim pyfakefs==3.1
diff --git a/rplugin/python3/neotags.py b/rplugin/python3/neotags.py
index 8946835..3e174c9 100644
--- a/rplugin/python3/neotags.py
+++ b/rplugin/python3/neotags.py
@@ -36,11 +36,11 @@ class NeotagsPlugin(object):
         self.debug('Triggered for "%s"' % filename)
 
         pwd = self.nvim.funcs.execute('pwd').strip()
-        relative_filename = filename.replace(pwd, '').lstrip('\/')
+        relative_filename = filename.replace(pwd, '').lstrip(r'\/')
 
         try:
             tags_file = self.get_tags_file(filename)
-        except:
+        except BaseException:
             self.error(
                 'Could not determine tags file to update for "%s"' % (
                     filename
@@ -53,7 +53,7 @@ class NeotagsPlugin(object):
             self.strip_existing_tags(tags_file, relative_filename)
             self.generate_tags(tags_file, relative_filename)
             self.debug('Tags updated for "%s"' % filename)
-        except:
+        except BaseException:
             self.error(
                 'Failed to update tags for "%s", reason: %s' % (
                     filename, traceback.format_exc()
diff --git a/rplugin/test/test_neotags.py b/rplugin/test/test_neotags.py
index 9dfc5f8..ba52754 100644
--- a/rplugin/test/test_neotags.py
+++ b/rplugin/test/test_neotags.py
@@ -7,6 +7,7 @@ import os
 
 from python3.neotags import NeotagsPlugin
 
+
 class TestNeotagsPlugin(fake_filesystem_unittest.TestCase):
 
     def setUp(self):
@@ -149,5 +150,6 @@ class TestNeotagsPlugin(fake_filesystem_unittest.TestCase):
         with open(tags_file) as f, open(expected_tags_file) as e:
             self.assertEqual(e.read(), f.read())
 
+
 if __name__ == '__main__':
     unittest.main()