From 261e4a6cf287180b69c4db407791e43ce90e50ad Mon Sep 17 00:00:00 2001
From: David Lord <davidism@gmail.com>
Date: Wed, 18 Jan 2023 10:31:08 -0800
Subject: [PATCH] fix flake8 bugbear errors

---
 .flake8              | 23 ++++++++++++-----------
 tests/test_appctx.py |  6 +++---
 tests/test_basic.py  |  4 ++--
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.flake8 b/.flake8
index 09809616..a5ce8844 100644
--- a/.flake8
+++ b/.flake8
@@ -1,12 +1,12 @@
 [flake8]
-# B = bugbear
-# E = pycodestyle errors
-# F = flake8 pyflakes
-# W = pycodestyle warnings
-# B9 = bugbear opinions
-# ISC = implicit str concat
-select = B, E, F, W, B9, ISC
-ignore =
+extend-select =
+    # bugbear
+    B
+    # bugbear opinions
+    B9
+    # implicit str concat
+    ISC
+extend-ignore =
     # slice notation whitespace, invalid
     E203
     # import at top, too many circular import fixes
@@ -15,10 +15,11 @@ ignore =
     E501
     # bare except, handled by bugbear B001
     E722
-    # bin op line break, invalid
-    W503
-    # requires Python 3.10
+    # zip with strict=, requires python >= 3.10
     B905
+    # string formatting opinion, B028 renamed to B907
+    B028
+    B907
 # up to 88 allowed by bugbear B950
 max-line-length = 80
 per-file-ignores =
diff --git a/tests/test_appctx.py b/tests/test_appctx.py
index f5ca0bde..aa3a8b4e 100644
--- a/tests/test_appctx.py
+++ b/tests/test_appctx.py
@@ -120,14 +120,14 @@ def test_app_tearing_down_with_unhandled_exception(app, client):
 
     @app.route("/")
     def index():
-        raise Exception("dummy")
+        raise ValueError("dummy")
 
-    with pytest.raises(Exception, match="dummy"):
+    with pytest.raises(ValueError, match="dummy"):
         with app.app_context():
             client.get("/")
 
     assert len(cleanup_stuff) == 1
-    assert isinstance(cleanup_stuff[0], Exception)
+    assert isinstance(cleanup_stuff[0], ValueError)
     assert str(cleanup_stuff[0]) == "dummy"
 
 
diff --git a/tests/test_basic.py b/tests/test_basic.py
index d547012a..9aca6679 100644
--- a/tests/test_basic.py
+++ b/tests/test_basic.py
@@ -1472,11 +1472,11 @@ def test_static_route_with_host_matching():
         rv = flask.url_for("static", filename="index.html", _external=True)
         assert rv == "http://example.com/static/index.html"
     # Providing static_host without host_matching=True should error.
-    with pytest.raises(Exception):
+    with pytest.raises(AssertionError):
         flask.Flask(__name__, static_host="example.com")
     # Providing host_matching=True with static_folder
     # but without static_host should error.
-    with pytest.raises(Exception):
+    with pytest.raises(AssertionError):
         flask.Flask(__name__, host_matching=True)
     # Providing host_matching=True without static_host
     # but with static_folder=None should not error.