python: update min version to 3.9

Debian 11 (bullseye) includes Python 3.9, and is what our kokoro build
environment uses still.  Everywhere else we care about has upgraded to
even newer versions.  gLinux, CrOS, and Crostini (Debian 12 bookworm)
are all at 3.11.  This will let us use newer typing style, and stop
writing code that is compatible with 3.6.

Change-Id: Ie28b646e00bcacd1b8ffdc05583cfef7b32d91ab
Reviewed-on: https://chromium-review.googlesource.com/c/apps/libapps/+/6201553
Reviewed-by: Joel Hockey <[email protected]>
Tested-by: kokoro <[email protected]>

Author: vapier

kokoro/lint

@@ -7,13 +7,12 @@
 
 from pathlib import Path
 import sys
-from typing import List
 
 import kokoro
 import libdot  # pylint: disable=wrong-import-order
 
 
-def _get_default_paths(basedir: Path) -> List[Path]:
+def _get_default_paths(basedir: Path) -> list[Path]:
     """Get list of paths to lint by default."""
     kokoro_files = sorted(libdot.lint.get_known_sources(basedir))
 

libdot/bin/black

@@ -11,7 +11,6 @@ import logging
 import shutil
 import subprocess
 import sys
-from typing import List
 
 import libdot
 
@@ -86,7 +85,7 @@ def get_parser() -> argparse.ArgumentParser:
     return parser
 
 
-def main(argv: List[str]) -> int:
+def main(argv: list[str]) -> int:
     """The main func!"""
     parser = get_parser()
     opts, args = parser.parse_known_args(argv)

libdot/bin/cpplint

@@ -7,7 +7,6 @@
 
 from pathlib import Path
 import sys
-from typing import List
 
 import libdot
 
@@ -29,7 +28,7 @@ CPPLINT_URL = (
 CPPLINT = libdot.BIN_DIR / f".cpplint.{CHROMIUM_REF}"
 
 
-def filter_known_files(paths: List[Path]) -> List[Path]:
+def filter_known_files(paths: list[Path]) -> list[Path]:
     """Figure out what files this linter supports."""
     ret = []
     for path in paths:

libdot/bin/jsonlint

@@ -11,12 +11,11 @@ import json
 import logging
 from pathlib import Path
 import sys
-from typing import List
 
 import libdot
 
 
-def filter_known_files(paths: List[Path]) -> List[Path]:
+def filter_known_files(paths: list[Path]) -> list[Path]:
     """Figure out what files this linter supports."""
     ret = []
     for path in paths:
@@ -84,7 +83,7 @@ def check_messages(path: Path, fix: bool = False) -> bool:
     return check_common(path, old_data, new_data, fix=fix)
 
 
-def check_files(paths: List[Path], fix: bool = False) -> bool:
+def check_files(paths: list[Path], fix: bool = False) -> bool:
     """Check all the JSON files."""
     ret = True
     for path in paths:

libdot/bin/libdot.py

@@ -19,7 +19,7 @@
 import sys
 import time
 import types
-from typing import Dict, List, Optional, Union
+from typing import Optional, Union
 import urllib.error
 import urllib.request
 
@@ -28,8 +28,8 @@
 # NB: We cannot require newer versions than CrOS itself supports.
 assert sys.version_info >= (
     3,
-    6,
-), f"Python 3.6 or newer is required; found {sys.version}"
+    9,
+), f"Python 3.9 or newer is required; found {sys.version}"
 
 
 BIN_DIR = Path(__file__).resolve().parent
@@ -176,12 +176,12 @@ def cmdstr(cmd):
 
 
 def run(
-    cmd: List[str],
-    cmd_prefix: List[str] = None,
-    log_prefix: List[str] = None,
+    cmd: list[str],
+    cmd_prefix: list[str] = None,
+    log_prefix: list[str] = None,
     check: bool = True,
     cwd: str = None,
-    extra_env: Dict[str, str] = None,
+    extra_env: dict[str, str] = None,
     **kwargs,
 ):
     """Run |cmd| inside of |cwd| and exit if it fails.
@@ -200,14 +200,6 @@ def run(
     Returns:
       A subprocess.CompletedProcess instance.
     """
-    # Python 3.6 doesn't support capture_output.
-    if sys.version_info < (3, 7):
-        capture_output = kwargs.pop("capture_output", None)
-        if capture_output:
-            assert "stdout" not in kwargs and "stderr" not in kwargs
-            kwargs["stdout"] = subprocess.PIPE
-            kwargs["stderr"] = subprocess.PIPE
-
     # The |env| setting specifies the entire environment, so we need to manually
     # merge our |extra_env| settings into it before passing it along.
     if extra_env is not None:
@@ -252,7 +244,7 @@ def sha256(path: Union[Path, str]) -> str:
 def unpack(
     archive: Union[Path, str],
     cwd: Optional[Path] = None,
-    files: Optional[List[Union[Path, str]]] = (),
+    files: Optional[list[Union[Path, str]]] = (),
 ):
     """Unpack |archive| into |cwd|."""
     archive = Path(archive)
@@ -283,9 +275,9 @@ def unpack(
 
 def pack(
     archive: Union[Path, str],
-    paths: List[Union[Path, str]],
+    paths: list[Union[Path, str]],
     cwd: Optional[Path] = None,
-    exclude: Optional[List[Union[Path, str]]] = (),
+    exclude: Optional[list[Union[Path, str]]] = (),
 ):
     """Create an |archive| with |paths| in |cwd|.
 

libdot/bin/lint

@@ -10,7 +10,6 @@ import logging
 import os
 from pathlib import Path
 import sys
-from typing import List
 
 import libdot
 
@@ -45,7 +44,7 @@ def is_generated_path(path):
     )
 
 
-def get_known_files(basedir: Path) -> List[Path]:
+def get_known_files(basedir: Path) -> list[Path]:
     """Return list of files committed to the tree."""
     # -z appends \0 to each path, it doesn't delimit them.  So strip off the
     # trailing \0 to avoid a spurious '' entry at the end.
@@ -62,7 +61,7 @@ def get_known_files(basedir: Path) -> List[Path]:
     return [basedir / x for x in all_files if (basedir / x).exists()]
 
 
-def get_known_sources(basedir: Path) -> List[Path]:
+def get_known_sources(basedir: Path) -> list[Path]:
     """Get list of committed files that we could possibly lint."""
     return (
         x
@@ -101,7 +100,7 @@ def lint_whitespace_data(path: Path, data: str) -> bool:
     return ret
 
 
-def lint_whitespace_files(paths: List[Path]) -> bool:
+def lint_whitespace_files(paths: list[Path]) -> bool:
     """Basic whitespace checks on text files."""
     ret = True
 
@@ -114,7 +113,7 @@ def lint_whitespace_files(paths: List[Path]) -> bool:
     return ret
 
 
-def lint_html_files(paths: List[Path]) -> bool:
+def lint_html_files(paths: list[Path]) -> bool:
     """Basic lint checks on HTML files."""
     logging.info("Linting HTML files %s", libdot.cmdstr(paths))
     ret = True
@@ -134,13 +133,13 @@ def lint_html_files(paths: List[Path]) -> bool:
     return ret
 
 
-def lint_text_files(paths: List[Path]) -> bool:
+def lint_text_files(paths: list[Path]) -> bool:
     """Basic lint checks on HTML files."""
     logging.info("Linting text files %s", libdot.cmdstr(paths))
     return lint_whitespace_files(paths)
 
 
-def _get_default_paths(basedir: Path) -> List[Path]:
+def _get_default_paths(basedir: Path) -> list[Path]:
     """Get list of paths to lint by default."""
     most_files = sorted(
         x for x in get_known_sources(basedir) if x.suffix not in {".js"}

libdot/bin/mdlint

@@ -7,12 +7,11 @@
 
 from pathlib import Path
 import sys
-from typing import List
 
 import libdot
 
 
-def filter_known_files(paths: List[Path]) -> List[Path]:
+def filter_known_files(paths: list[Path]) -> list[Path]:
     """Figure out what files this linter supports."""
     ret = []
     for path in paths:

libdot/bin/node_sync_with_chromium

@@ -8,7 +8,6 @@
 import logging
 import re
 import sys
-from typing import Dict
 
 import libdot
 
@@ -50,7 +49,7 @@ def update_file(var, value):
     NODE_SCRIPT.write_text("\n".join(lines) + "\n", encoding="utf-8")
 
 
-def update_hash(var: str, deps: Dict) -> None:
+def update_hash(var: str, deps: dict) -> None:
     """Update |var| in our tree with the |new_hash|."""
     # The structure expected is:
     # {
@@ -77,7 +76,7 @@ def update_hash(var: str, deps: Dict) -> None:
     update_file(var, new_hash)
 
 
-def fetch_deps(uri: str) -> Dict:
+def fetch_deps(uri: str) -> dict:
     """Fetch & parse Chromium DEPS file."""
     data = fetch_data(uri)
     # Very basic implementation of the format to get the data we care about.

libdot/bin/pylint

@@ -12,7 +12,6 @@ import os
 from pathlib import Path
 import shutil
 import sys
-from typing import List
 
 import libdot
 
@@ -68,7 +67,7 @@ def convert_to_kokoro(data):
         }
 
 
-def filter_known_files(paths: List[Path]) -> List[Path]:
+def filter_known_files(paths: list[Path]) -> list[Path]:
     """Figure out what files this linter supports."""
     ret = []
     for path in paths:
@@ -95,18 +94,11 @@ def filter_known_files(paths: List[Path]) -> List[Path]:
 
 @functools.lru_cache(maxsize=1)
 def find_pylint():
-    """Figure out the name of the pylint tool.
-
-    It keeps changing with Python 2->3 migrations.  Fun.
-    """
+    """Figure out the name of the pylint tool."""
     # Prefer our vpython copy if possible.
     if shutil.which("vpython3"):
         return libdot.BIN_DIR / "pylint-vpython"
 
-    # Prefer pylint3 as that's what we want.
-    if shutil.which("pylint3"):
-        return "pylint3"
-
     # If there's no pylint, give up.
     if not shutil.which("pylint"):
         logging.error(
@@ -115,18 +107,7 @@ def find_pylint():
         )
         sys.exit(1)
 
-    # Make sure pylint is using Python 3.
-    result = libdot.run(
-        ["pylint", "--version"], capture_output=True, encoding="utf-8"
-    )
-    if "Python 3" in result.stdout:
-        return "pylint"
-
-    logging.error(
-        "pylint does not support Python 3; please upgrade:\n%s",
-        result.stdout.strip(),
-    )
-    sys.exit(1)
+    return "pylint"
 
 
 def setup():

nassh/bin/generate-changelog

@@ -9,7 +9,6 @@ import html
 import logging
 import os
 import sys
-from typing import List
 
 import nassh  # pylint: disable=wrong-import-order
 import libdot
@@ -23,7 +22,7 @@ CHANGELOG_ENTRY_TEMPLATE = """\
 """
 
 
-def generate_html(tag: str, entries: List[List[str]]):
+def generate_html(tag: str, entries: list[list[str]]):
     """Generate the changelog file from |entries|."""
     with open(CHANGELOG_TEMPLATE, "r", encoding="utf-8") as fp:
         template = fp.read()
@@ -38,7 +37,7 @@ def generate_html(tag: str, entries: List[List[str]]):
         fp.write(output)
 
 
-def get_entries(tag: str) -> List[List[str]]:
+def get_entries(tag: str) -> list[list[str]]:
     """Find all the commits since |tag|."""
     output = libdot.run(
         ["git", "log", "--format=%H %s", f"{tag}..HEAD"],
@@ -90,7 +89,7 @@ def get_parser():
     return parser
 
 
-def main(argv: List[str]):
+def main(argv: list[str]):
     """The main func!"""
     parser = get_parser()
     opts = parser.parse_args(argv)

ssh_client/bin/ssh_client.py

@@ -12,7 +12,6 @@
 import re
 import shutil
 import sys
-from typing import List
 
 
 BIN_DIR = Path(__file__).resolve().parent
@@ -77,7 +76,7 @@ def emake(*args, **kwargs):
     run(["make", f"-j{jobs}"] + list(args), **kwargs)
 
 
-def get_mandoc_cmd(p: str) -> List[str]:
+def get_mandoc_cmd(p: str) -> list[str]:
     """Get the mandoc command for the specified package."""
     return [
         "mandoc",