Merge pull request #12256 from bluetech/misc2

2 small cleanups

src/_pytest/_code/code.py

@@ -52,7 +52,7 @@ from _pytest.pathlib import absolutepath
 from _pytest.pathlib import bestrelpath
 
 
-if sys.version_info[:2] < (3, 11):
+if sys.version_info < (3, 11):
     from exceptiongroup import BaseExceptionGroup
 
 _TracebackStyle = Literal["long", "short", "line", "no", "native", "value", "auto"]
@@ -703,7 +703,7 @@ class ExceptionInfo(Generic[E]):
             # Workaround for https://github.com/python/cpython/issues/98778 on
             # Python <= 3.9, and some 3.10 and 3.11 patch versions.
             HTTPError = getattr(sys.modules.get("urllib.error", None), "HTTPError", ())
-            if sys.version_info[:2] <= (3, 11) and isinstance(exc, HTTPError):
+            if sys.version_info < (3, 12) and isinstance(exc, HTTPError):
                 notes = []
             else:
                 raise

src/_pytest/config/argparsing.py

@@ -448,7 +448,7 @@ class MyOptionParser(argparse.ArgumentParser):
             getattr(parsed, FILE_OR_DIR).extend(unrecognized)
         return parsed
 
-    if sys.version_info[:2] < (3, 9):  # pragma: no cover
+    if sys.version_info < (3, 9):  # pragma: no cover
         # Backport of https://github.com/python/cpython/pull/14316 so we can
         # disable long --argument abbreviations without breaking short flags.
         def _parse_optional(

src/_pytest/fixtures.py

@@ -69,7 +69,7 @@ from _pytest.scope import HIGH_SCOPES
 from _pytest.scope import Scope
 
 
-if sys.version_info[:2] < (3, 11):
+if sys.version_info < (3, 11):
     from exceptiongroup import BaseExceptionGroup
 
 

src/_pytest/nodes.py

@@ -765,7 +765,7 @@ class Item(Node, abc.ABC):
         and lineno is a 0-based line number.
         """
         location = self.reportinfo()
-        path = absolutepath(os.fspath(location[0]))
+        path = absolutepath(location[0])
         relfspath = self.session._node_location_to_relpath(path)
         assert type(location[2]) is str
         return (relfspath, location[1], location[2])

src/_pytest/pathlib.py

@@ -924,13 +924,13 @@ def visit(
             yield from visit(entry.path, recurse)
 
 
-def absolutepath(path: Union[Path, str]) -> Path:
+def absolutepath(path: "Union[str, os.PathLike[str]]") -> Path:
     """Convert a path to an absolute path using os.path.abspath.
 
     Prefer this over Path.resolve() (see #6523).
     Prefer this over Path.absolute() (not public, doesn't normalize).
     """
-    return Path(os.path.abspath(str(path)))
+    return Path(os.path.abspath(path))
 
 
 def commonpath(path1: Path, path2: Path) -> Optional[Path]:

src/_pytest/runner.py

@@ -39,7 +39,7 @@ from _pytest.outcomes import Skipped
 from _pytest.outcomes import TEST_OUTCOME
 
 
-if sys.version_info[:2] < (3, 11):
+if sys.version_info < (3, 11):
     from exceptiongroup import BaseExceptionGroup
 
 if TYPE_CHECKING:

testing/code/test_excinfo.py

@@ -28,7 +28,7 @@ import pytest
 if TYPE_CHECKING:
     from _pytest._code.code import _TracebackStyle
 
-if sys.version_info[:2] < (3, 11):
+if sys.version_info < (3, 11):
     from exceptiongroup import ExceptionGroup
 
 

testing/test_runner.py

@@ -23,7 +23,7 @@ from _pytest.pytester import Pytester
 import pytest
 
 
-if sys.version_info[:2] < (3, 11):
+if sys.version_info < (3, 11):
     from exceptiongroup import ExceptionGroup
 
 

testing/test_skipping.py

@@ -1146,7 +1146,7 @@ def test_errors_in_xfail_skip_expressions(pytester: Pytester) -> None:
     if pypy_version_info is not None and pypy_version_info < (6,):
         markline = markline[1:]
 
-    if sys.version_info[:2] >= (3, 10):
+    if sys.version_info >= (3, 10):
         expected = [
             "*ERROR*test_nameerror*",
             "*asd*",