Update pyupgrade version to py3.9+

This update applies various source tree changes as well.

Author: sirosen

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
   rev: v3.20.0
   hooks:
     - id: pyupgrade
-      args: ["--py38-plus"]
+      args: ["--py39-plus"]
 - repo: https://github.com/psf/black-pre-commit-mirror
   rev: 25.9.0
   hooks:

src/globus_sdk/_internal/extensions/sphinxext/utils.py

@@ -61,7 +61,7 @@ def derive_doc_url_base(service: str | None) -> str:
         raise ValueError(f"Unsupported extdoclink service '{service}'")
 
 
-@functools.lru_cache(maxsize=None)
+@functools.cache
 def read_sphinx_params(docstring: str) -> tuple[str, ...]:
     """
     Given a docstring, extract the `:param:` declarations into a tuple of strings.

src/globus_sdk/_internal/lazy_import.py

@@ -220,14 +220,9 @@ def _load_statement(self, statement: ast.AST) -> None:
 def _parse_pyi_ast(anchor_module_name: str, pyi_filename: str) -> ast.Module:
     import importlib.resources
 
-    if sys.version_info >= (3, 9):
-        source = (
-            importlib.resources.files(anchor_module_name)  # pylint: disable=no-member
-            .joinpath(pyi_filename)
-            .read_bytes()
-        )
-    else:
-        source = importlib.resources.read_binary(  # pylint: disable=deprecated-method
-            anchor_module_name, pyi_filename
-        )
+    source = (
+        importlib.resources.files(anchor_module_name)  # pylint: disable=no-member
+        .joinpath(pyi_filename)
+        .read_bytes()
+    )
     return ast.parse(source)

src/globus_sdk/login_flows/local_server_login_flow_manager/local_server.py

@@ -7,6 +7,7 @@
 
 from __future__ import annotations
 
+import importlib.resources
 import os
 import queue
 import socket
@@ -21,15 +22,10 @@
 from . import html_files
 from .errors import LocalServerLoginError
 
-if sys.version_info >= (3, 9):
-    import importlib.resources as importlib_resources
-else:  # Python < 3.9
-    import importlib_resources
-
 _IS_WINDOWS = os.name == "nt"
 
 DEFAULT_HTML_TEMPLATE = Template(
-    importlib_resources.files(html_files)
+    importlib.resources.files(html_files)
     .joinpath("local_server_landing_page.html")
     .read_text()
 )