From 80dfb3b023a268d6d6204220665c2cf43eac66df Mon Sep 17 00:00:00 2001
From: Chad Smith <chad.smith@canonical.com>
Date: Fri, 4 May 2018 11:18:22 -0600
Subject: pycodestyle: Fix deprecated string literals, move away from flake8.

Fix remaining pycodesytle warnings related to invalid string literals
introduced in more recent pycodeflakes versions
https://bugs.python.org/issue27364 .

Also stop using flake8 in tox as it is incompatible with newer versions of
pyflakes. Instead we now add tox environments for pycodestyle and pyflakes
individually.

Set the versions in both pycodestyle and pyflakes to the currently
available versions.
---
 cloudinit/netinfo.py                             |  2 +-
 tests/unittests/test_handler/test_handler_ntp.py |  2 +-
 tox.ini                                          | 16 +++++++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cloudinit/netinfo.py b/cloudinit/netinfo.py
index 1be76fe7..9ff929c2 100644
--- a/cloudinit/netinfo.py
+++ b/cloudinit/netinfo.py
@@ -138,7 +138,7 @@ def _netdev_info_ifconfig(ifconfig_data):
             elif toks[i].startswith("scope:"):
                 devs[curdev]['ipv6'][-1]['scope6'] = toks[i].lstrip("scope:")
             elif toks[i] == "scopeid":
-                res = re.match(".*<(\S+)>", toks[i + 1])
+                res = re.match(r'.*<(\S+)>', toks[i + 1])
                 if res:
                     devs[curdev]['ipv6'][-1]['scope6'] = res.group(1)
     return devs
diff --git a/tests/unittests/test_handler/test_handler_ntp.py b/tests/unittests/test_handler/test_handler_ntp.py
index 17c53559..6da4564e 100644
--- a/tests/unittests/test_handler/test_handler_ntp.py
+++ b/tests/unittests/test_handler/test_handler_ntp.py
@@ -706,7 +706,7 @@ class TestSupplementalSchemaValidation(CiTestCase):
         cfg = {'confpath': 'someconf', 'check_exe': '', 'service_name': '',
                'template': 'asdf', 'template_name': None, 'packages': 'NOPE'}
         match = (r'Invalid ntp configuration:\\nExpected a list of required'
-                 ' package names for ntp:config:packages. Found \(NOPE\)')
+                 ' package names for ntp:config:packages. Found \\(NOPE\\)')
         with self.assertRaisesRegex(ValueError, match):
             cc_ntp.supplemental_schema_validation(cfg)
 
diff --git a/tox.ini b/tox.ini
index 818ade3d..2fb3209d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py3, flake8, xenial, pylint
+envlist = py27, py3, xenial, pycodestyle, pyflakes, pylint
 recreate = True
 
 [testenv]
@@ -7,14 +7,11 @@ commands = python -m nose {posargs:tests/unittests cloudinit}
 setenv =
     LC_ALL = en_US.utf-8
 
-[testenv:flake8]
+[testenv:pycodestyle]
 basepython = python3
 deps =
-    pycodestyle==2.3.1
-    pyflakes==1.5.0
-    flake8==3.3.0
-    hacking==0.13.0
-commands = {envpython} -m flake8 {posargs:cloudinit/ tests/ tools/}
+    pycodestyle==2.4.0
+commands = {envpython} -m pycodestyle {posargs:cloudinit/ tests/ tools/}
 
 # https://github.com/gabrielfalcao/HTTPretty/issues/223
 setenv =
@@ -118,6 +115,11 @@ deps =
 commands = {envpython} -m pycodestyle {posargs:cloudinit/ tests/ tools/}
 deps = pycodestyle
 
+[testenv:pyflakes]
+commands = {envpython} -m pyflakes {posargs:cloudinit/ tests/ tools/}
+deps =
+    pyflakes==1.6.0
+
 [testenv:tip-pyflakes]
 commands = {envpython} -m pyflakes {posargs:cloudinit/ tests/ tools/}
 deps = pyflakes
-- 
cgit v1.2.3