normpath, fix venv.interpreter_runfiles NPE

Author: rickeylev

python/private/py_executable.bzl

@@ -476,7 +476,7 @@ WARNING: Target: {}
 
     # The interpreter is added this late in the process so that it isn't
     # added to the zipped files.
-    if venv and venv.interpreter:
+    if venv and venv.interpreter_runfiles:
         extra_runfiles = extra_runfiles.merge(venv.interpreter_runfiles)
     return struct(
         # depset[File] of additional files that should be included as default
@@ -494,8 +494,8 @@ WARNING: Target: {}
         app_runfiles = app_runfiles.build(ctx),
         # File|None; the venv `bin/python3` file, if any.
         venv_python_exe = venv.interpreter if venv else None,
-        # runfiles; runfiles in the venv for the interpreter
-        venv_interpreter_runfiles = venv.interpreter_runfiles,
+        # runfiles|None; runfiles in the venv for the interpreter
+        venv_interpreter_runfiles = venv.interpreter_runfiles if venv else None,
     )
 
 def _create_zip_main(ctx, *, stage2_bootstrap, runtime_details, venv):

python/private/zipapp/zip_main_template.py

@@ -46,6 +46,21 @@
 IS_WINDOWS = os.name == "nt"
 
 
+EXTRACT_ROOT = os.environ.get("RULES_PYTHON_EXTRACT_ROOT")
+
+# Change the paths with Unix-style forward slashes to backslashes for windows.
+# Windows usually transparently rewrites them, but e.g. `\\?\` paths require
+# backslashes to be properly understood by Windows APIs.
+if IS_WINDOWS:
+    from os.path import normpath
+    _STAGE2_BOOTSTRAP = normpath(_STAGE2_BOOTSTRAP)
+    if _PYTHON_BINARY_VENV:
+        _PYTHON_BINARY_VENV = normpath(_PYTHON_BINARY_VENV)
+    _PYTHON_BINARY_ACTUAL = normpath(_PYTHON_BINARY_ACTUAL)
+    EXTRACT_DIR = normpath(EXTRACT_DIR)
+    if EXTRACT_ROOT:
+        EXTRACT_ROOT = normpath(EXTRACT_ROOT)
+
 def print_verbose(*args, mapping=None, values=None):
     if not bool(os.environ.get("RULES_PYTHON_BOOTSTRAP_VERBOSE")):
         return