Merge remote-tracking branch 'origin/disable_assertion_rewriting_external_modules' into disable_assertion_rewriting_external_modules

# Conflicts:
#	testing/test_assertrewrite.py

Author: Tusenka

src/_pytest/assertion/__init__.py

@@ -3,8 +3,8 @@
 
 from __future__ import annotations
 
-import os
 from collections.abc import Generator
+import os
 import sys
 from typing import Any
 from typing import TYPE_CHECKING
@@ -122,6 +122,7 @@ def rootpath(self):
             # Ref: https://github.com/pytest-dev/py/pull/207
             return os.path.dirname(os.path.abspath(sys.argv[0]))
 
+
 def install_importhook(config: Config) -> rewrite.AssertionRewritingHook:
     """Try to install the rewrite hook, raise SystemError if it fails."""
     config.stash[assertstate_key] = AssertionState(config, "rewrite")

src/_pytest/assertion/rewrite.py

@@ -133,7 +133,7 @@ def find_spec(
 
         return importlib.util.spec_from_file_location(
             name,
-            fn  ,
+            fn,
             loader=self,
             submodule_search_locations=spec.submodule_search_locations,
         )
@@ -246,7 +246,6 @@ def _should_rewrite(self, name: str, fn: str, state: AssertionState) -> bool:
 
         return self._is_marked_for_rewrite(name, state)
 
-
     def _is_marked_for_rewrite(self, name: str, state: AssertionState) -> bool:
         try:
             return self._marked_for_rewrite_cache[name]