Merge lp:~jelmer/brz/skip-python3.5 into lp:brz/3.1

[Jelmer Vernooij]

Fix support for Python 3.5; skip flake8.

Fix support for Python 3.5.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/tests/test_source.py'
--- breezy/tests/test_source.py	2020-05-30 01:48:46 +0000
+++ breezy/tests/test_source.py	2020-11-28 04:19:05 +0000
@@ -325,7 +325,14 @@
             self.fail('\n\n'.join(problems))
 
     def test_flake8(self):
-        self.requireFeature(features.flake8)
+        try:
+            self.requireFeature(features.flake8)
+        except NameError:
+            # importlib_metadata uses ModuleNotFoundError, which is
+            # python 3.6 only
+            if sys.version_info[:2] <= (3, 5):
+                self.skipTest('python version too old')
+            raise
         # Older versions of flake8 don't support the 'paths'
         # variable
         new_path = list(sys.path)