flake8: move the pinned version of flake8 up to 3.3.0

This just moves flake8 and related tools up to newer versions and fixes
the complaints associated with that.

We added to the list of flake8 ignores:
 H102: do not put vim info in source files
 H304: no relative imports

Also updates and pins the following in the flake8 environment:
  pep8:        1.7.0  => drop  (although hacking still pulls it in).
  pyflakes     1.1.0  => 1.5.0
  hacking      0.10.2 => 0.13.0
  flake8       2.5.4  => 3.3.0
  pycodestyle  none   => 2.3.1

1 files changed, 5 insertions, 5 deletions

diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
index 490760d1..014aa6a3 100644
--- a/tests/unittests/test_util.py
+++ b/tests/unittests/test_util.py
@@ -44,7 +44,7 @@ class TestGetCfgOptionListOrStr(helpers.TestCase):
         """None is returned if key is not found and no default given."""
         config = {}
         result = util.get_cfg_option_list(config, "key")
-        self.assertEqual(None, result)
+        self.assertIsNone(result)
 
     def test_not_found_with_default(self):
         """Default is returned if key is not found."""
@@ -432,13 +432,13 @@ class TestReadDMIData(helpers.FilesystemMockingTestCase):
     def test_none_returned_if_neither_source_has_data(self):
         self.patch_mapping({})
         self._configure_dmidecode_return('key', 'value')
-        self.assertEqual(None, util.read_dmi_data('expect-fail'))
+        self.assertIsNone(util.read_dmi_data('expect-fail'))
 
     def test_none_returned_if_dmidecode_not_in_path(self):
         self.patched_funcs.enter_context(
             mock.patch.object(util, 'which', lambda _: False))
         self.patch_mapping({})
-        self.assertEqual(None, util.read_dmi_data('expect-fail'))
+        self.assertIsNone(util.read_dmi_data('expect-fail'))
 
     def test_dots_returned_instead_of_foxfox(self):
         # uninitialized dmi values show as \xff, return those as .
@@ -626,8 +626,8 @@ class TestSubp(helpers.TestCase):
 
     def test_returns_none_if_no_capture(self):
         (out, err) = util.subp(self.stdin2out, data=b'', capture=False)
-        self.assertEqual(err, None)
-        self.assertEqual(out, None)
+        self.assertIsNone(err)
+        self.assertIsNone(out)
 
     def test_bunch_of_slashes_in_path(self):
         self.assertEqual("/target/my/path/",