Merge ~chad.smith/cloud-init:cleanup/sync-pycodestyle into cloud-init:master

[Chad Smith]

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.

See commit message
to test:
tox -r -e tip-pycodestyle
tox -r -e flake8

[Chad Smith (chad.smith)]

should fix jenkins per https://jenkins.ubuntu.com/server/view/cloud-init/job/cloud-init-ci-nightly/317/consoleFull

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:e4be9074bad042d974a1bab05719238b9d325635
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1098/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1098/rebuild

review: Approve (continuous-integration)

f47b728... by Chad Smith on 2018-05-02

drop flake8 tox env in favor of pycodestyle

c10de3c... by Chad Smith on 2018-05-02

switch default tox to run pycodestyle

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:c10de3c914e260d62da35fcd57a293fe0beb5762
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1099/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1099/rebuild

review: Approve (continuous-integration)

[Joshua Powers (powersj)]

review: Approve

315f0c6... by Chad Smith on 2018-05-03

add pinned pyflakes env and include it in tox default envlist

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:315f0c6ed189e9c704bad25a61fdd9d4f03a86a2
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1100/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1100/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

suggested commit message:

  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.

[Scott Moser (smoser)]

review: Approve

[Chad Smith (chad.smith)]

Thank you for your merge proposal.

Your branch has been set to 'Work in progress'.
Please set the branch back to 'Needs Review' after resolving the issues below.

Thanks again,
Your friendly neighborhood cloud-init robot.

Please fix the following issues:
------------------------------
Commit message lints:
 - Line #10 has 2 too many characters. Line starts with: "Set the versions in both"...
------------------------------

For more information, see commit message guidelines at
https://cloudinit.readthedocs.io/en/latest/topics/hacking.html#do-these-things-for-each-feature-or-bug

review: Needs Fixing

[Chad Smith (chad.smith)]

review: Abstain

[Chad Smith (chad.smith)]

An upstream commit landed for this bug.

To view that commit see the following URL:
https://git.launchpad.net/cloud-init/commit/?id=80dfb3b0

diff --git a/cloudinit/netinfo.py b/cloudinit/netinfo.py
index 1be76fe..9ff929c 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 17c5355..6da4564 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 818ade3..2fb3209 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