refactor: clean up web framework tests

Only specify the need to rewrite assertions for
_appmap.test.web_framework once. Improve lint score a bit, too.

Author: apotterri

_appmap/importer.py

@@ -51,8 +51,8 @@ def __new__(cls, scope, fn, static_fn):
     def fntype(self):
         if self.scope == Scope.MODULE:
             return FnType.MODULE
-        else:
-            return FnType.classify(self.static_fn)
+
+        return FnType.classify(self.static_fn)
 
 
 class Filter(ABC):  # pylint: disable=too-few-public-methods

_appmap/metadata.py

@@ -1,7 +1,6 @@
 """Shared metadata gathering"""
 
 import platform
-import re
 from functools import lru_cache
 
 from . import utils

_appmap/test/__init__.py

@@ -0,0 +1,5 @@
+import pytest
+
+# Make sure assertions in web_framework get rewritten (e.g. to show
+# diffs in generated appmaps)
+pytest.register_assert_rewrite("_appmap.test.web_framework")

_appmap/test/test_configuration.py

@@ -84,39 +84,40 @@ def test_config_no_message(caplog):
     assert caplog.text == ""
 
 
-cf = lambda: ConfigFilter(NullFilter())
+def cf():
+    return ConfigFilter(NullFilter())
 
 
 @pytest.mark.appmap_enabled(config="appmap-class.yml")
 def test_class_included():
-    f = Filterable("package1.package2.Mod1Class", None)
+    f = Filterable(None, "package1.package2.Mod1Class", None)
     assert cf().filter(f) is True
 
 
 @pytest.mark.appmap_enabled(config="appmap-func.yml")
 def test_function_included():
-    f = Filterable("package1.package2.Mod1Class.func", None)
+    f = Filterable(None, "package1.package2.Mod1Class.func", None)
     assert cf().filter(f) is True
 
 
 @pytest.mark.appmap_enabled(config="appmap-class.yml")
 def test_function_included_by_class():
-    f = Filterable("package1.package2.Mod1Class.func", None)
+    f = Filterable(None, "package1.package2.Mod1Class.func", None)
     assert cf().filter(f) is True
 
 
 @pytest.mark.appmap_enabled
 class TestConfiguration:
     def test_package_included(self):
-        f = Filterable("package1.cls", None)
+        f = Filterable(None, "package1.cls", None)
         assert cf().filter(f) is True
 
     def test_function_included_by_package(self):
-        f = Filterable("package1.package2.Mod1Class.func", None)
+        f = Filterable(None, "package1.package2.Mod1Class.func", None)
         assert cf().filter(f) is True
 
     def test_class_prefix_doesnt_match(self):
-        f = Filterable("package1_prefix.cls", None)
+        f = Filterable(None, "package1_prefix.cls", None)
         assert cf().filter(f) is False
 
 

_appmap/test/test_django.py

@@ -21,11 +21,6 @@
 from _appmap.metadata import Metadata
 
 from ..test.helpers import DictIncluding
-
-# Make sure assertions in web_framework get rewritten (e.g. to show
-# diffs in generated appmaps)
-pytest.register_assert_rewrite("_appmap.test.web_framework")
-
 # pylint: disable=unused-import,wrong-import-position
 from .web_framework import TestRemoteRecording  # pyright:ignore
 from .web_framework import TestRequestCapture  # pyright: ignore

_appmap/test/test_flask.py

@@ -13,11 +13,6 @@
 from appmap.flask import AppmapFlask
 
 from ..test.helpers import DictIncluding
-
-# Make sure assertions in web_framework get rewritten (e.g. to show
-# diffs in generated appmaps)
-pytest.register_assert_rewrite("_appmap.test.web_framework")
-
 # pylint: disable=unused-import,wrong-import-position
 from .web_framework import TestRemoteRecording  # pyright:ignore
 from .web_framework import TestRequestCapture  # pyright: ignore

appmap/flask.py

@@ -2,8 +2,6 @@
 import re
 import time
 
-import flask
-import flask.cli
 import jinja2
 from flask import g, got_request_exception, request, request_finished, request_started
 from flask.cli import ScriptInfo