cleanup

Author: rickeylev

python/private/zipapp/py_zipapp_rule.bzl

@@ -35,15 +35,15 @@ def _create_zipapp_main_py(ctx, py_runtime, py_executable, stage2_bootstrap):
         template = py_runtime.zip_main_template,
         output = zip_main_py,
         substitutions = {
-            "%python_binary%": venv_python_exe_path,
-            "%python_binary_actual%": python_binary_actual_path,
-            "%stage2_bootstrap%": runfiles_root_path(ctx, stage2_bootstrap.short_path),
-            "%workspace_name%": ctx.workspace_name,
             "%EXTRACT_DIR%": paths.join(
                 (ctx.label.repo_name or "_main"),
                 ctx.label.package,
                 ctx.label.name,
             ),
+            "%python_binary%": venv_python_exe_path,
+            "%python_binary_actual%": python_binary_actual_path,
+            "%stage2_bootstrap%": runfiles_root_path(ctx, stage2_bootstrap.short_path),
+            "%workspace_name%": ctx.workspace_name,
         },
     )
     return zip_main_py

python/private/zipapp/zip_main_template.py

@@ -22,12 +22,12 @@
 del sys.path[0]
 
 import os
-from os.path import join
 import shutil
 import stat
 import subprocess
 import tempfile
 import zipfile
+from os.path import dirname, join
 
 # runfiles-root-relative path
 _STAGE2_BOOTSTRAP = "%stage2_bootstrap%"
@@ -124,7 +124,7 @@ def search_path(name):
     search_path = os.getenv("PATH", os.defpath).split(os.pathsep)
     for directory in search_path:
         if directory:
-            path = os.path.join(directory, name)
+            path = join(directory, name)
             if os.path.isfile(path) and os.access(path, os.X_OK):
                 return path
     return None
@@ -145,7 +145,7 @@ def find_binary(runfiles_root, bin_name):
     # Use normpath() to convert slashes to os.sep on Windows.
     elif os.sep in os.path.normpath(bin_name):
         # Case 3: Path is relative to the repo root.
-        return os.path.join(runfiles_root, bin_name)
+        return join(runfiles_root, bin_name)
     else:
         # Case 4: Path has to be looked up in the search path.
         return search_path(bin_name)
@@ -167,7 +167,7 @@ def extract_zip(zip_path, dest_dir):
     dest_dir = get_windows_path_with_unc_prefix(dest_dir)
     with zipfile.ZipFile(zip_path) as zf:
         for info in zf.infolist():
-            file_path = os.path.abspath(os.path.join(dest_dir, info.filename))
+            file_path = os.path.abspath(join(dest_dir, info.filename))
             # If the file exists, it might be a symlink or read-only file from a previous extraction.
             # Unlink it first so zipfile.extract doesn't corrupt the symlink target or fail on read-only files.
             if os.path.lexists(file_path) and not os.path.isdir(file_path):
@@ -177,7 +177,7 @@ def extract_zip(zip_path, dest_dir):
                     # On Windows, unlinking a read-only file fails.
                     os.chmod(file_path, stat.S_IWRITE)
                     os.unlink(file_path)
-            
+
             zf.extract(info, dest_dir)
             # The Unix st_mode bits (see "man 7 inode") are stored in the upper 16
             # bits of external_attr.
@@ -200,10 +200,10 @@ def create_runfiles_root():
         extract_root = join(EXTRACT_ROOT, EXTRACT_DIR)
     else:
         extract_root = tempfile.mkdtemp("", "Bazel.runfiles_")
-    extract_zip(os.path.dirname(__file__), extract_root)
+    extract_zip(dirname(__file__), extract_root)
     # IMPORTANT: Later code does `rm -fr` on dirname(runfiles_root) -- it's
     # important that deletion code be in sync with this directory structure
-    return os.path.join(extract_root, "runfiles")
+    return join(extract_root, "runfiles")
 
 
 def execute_file(
@@ -242,7 +242,7 @@ def execute_file(
     try:
         subprocess_argv = [python_program]
         if not EXTRACT_ROOT:
-            subprocess_argv.append(f"-XRULES_PYTHON_ZIP_DIR={os.path.dirname(runfiles_root)}")
+            subprocess_argv.append(f"-XRULES_PYTHON_ZIP_DIR={dirname(runfiles_root)}")
         subprocess_argv.append(main_filename)
         subprocess_argv += args
         print_verbose("subprocess argv:", values=subprocess_argv)
@@ -255,7 +255,7 @@ def execute_file(
             # NOTE: dirname() is called because create_runfiles_root() creates a
             # sub-directory within a temporary directory, and we want to remove the
             # whole temporary directory.
-            extract_root = os.path.dirname(runfiles_root)
+            extract_root = dirname(runfiles_root)
             print_verbose("cleanup: rmtree: ", extract_root)
             shutil.rmtree(extract_root, True)
 
@@ -289,7 +289,7 @@ def main():
     # See: https://docs.python.org/3.11/using/cmdline.html#envvar-PYTHONSAFEPATH
     new_env["PYTHONSAFEPATH"] = "1"
 
-    main_filename = os.path.join(runfiles_root, main_rel_path)
+    main_filename = join(runfiles_root, main_rel_path)
     main_filename = get_windows_path_with_unc_prefix(main_filename)
     assert os.path.exists(main_filename), (
         "Cannot exec() %r: file not found." % main_filename
@@ -299,7 +299,7 @@ def main():
     )
 
     if _PYTHON_BINARY_VENV:
-        python_program = os.path.join(runfiles_root, _PYTHON_BINARY_VENV)
+        python_program = join(runfiles_root, _PYTHON_BINARY_VENV)
         # When a venv is used, the `bin/python3` symlink may need to be created.
         # This case occurs when "create venv at runtime" or "resolve python at
         # runtime" modes are enabled.
@@ -311,7 +311,7 @@ def main():
                     "Program's venv binary not under runfiles: {python_program}"
                 )
             symlink_to = find_binary(runfiles_root, _PYTHON_BINARY_ACTUAL)
-            os.makedirs(os.path.dirname(python_program), exist_ok=True)
+            os.makedirs(dirname(python_program), exist_ok=True)
             try:
                 os.symlink(symlink_to, python_program)
             except OSError as e:
@@ -340,7 +340,7 @@ def main():
     # change directory to the right runfiles directory.
     # (So that the data files are accessible)
     if os.environ.get("RUN_UNDER_RUNFILES") == "1":
-        workspace = os.path.join(runfiles_root, _WORKSPACE_NAME)
+        workspace = join(runfiles_root, _WORKSPACE_NAME)
 
     sys.stdout.flush()
     execute_file(