Skip to content

Commit 0c42698

Browse files
committed
cleanup var name
1 parent 49aa579 commit 0c42698

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

python/private/py_executable.bzl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ def _create_venv(ctx, output_prefix, imports, runtime_details, add_runfiles_root
577577
runtime = runtime,
578578
)
579579

580-
site_packages = "{}/{}".format(venv_ctx_rel_root, venv_details.venv_site_packages)
580+
site_packages = "{}/{}".format(venv_ctx_rel_root, venv_details.site_packages)
581581

582582
pth = ctx.actions.declare_file("{}/bazel.pth".format(site_packages))
583583
ctx.actions.write(pth, "import _bazel_site_init\n")
@@ -628,7 +628,7 @@ def _create_venv(ctx, output_prefix, imports, runtime_details, add_runfiles_root
628628
interpreter_actual_path = interpreter_actual_path,
629629
files_without_interpreter = files_without_interpreter,
630630
# string; venv-relative path to the site-packages directory.
631-
venv_site_packages = venv_details.venv_site_packages,
631+
venv_site_packages = venv_details.site_packages,
632632
# string; runfiles-root relative path to venv root.
633633
venv_root = runfiles_root_path(
634634
ctx,
@@ -732,11 +732,11 @@ def _create_venv_unixy(ctx, *, venv_ctx_rel_root, runtime, interpreter_actual_pa
732732
if "t" in runtime.abi_flags:
733733
version += "t"
734734

735-
venv_site_packages = "lib/python{}/site-packages".format(version)
735+
site_packages = "lib/python{}/site-packages".format(version)
736736
return _venv_details(
737737
interpreter = interpreter,
738738
pyvenv_cfg = pyvenv_cfg,
739-
venv_site_packages = venv_site_packages,
739+
site_packages = site_packages,
740740
bin_dir = bin_dir,
741741
recreate_venv_at_runtime = recreate_venv_at_runtime,
742742
interpreter_runfiles = interpreter_runfiles.build(ctx),
@@ -793,12 +793,12 @@ def _create_venv_windows(ctx, *, venv_ctx_rel_root, runtime, interpreter_actual_
793793
))
794794

795795
# See site.py logic: Windows uses a version/build agnostic site-packages path
796-
venv_site_packages = "Lib/site-packages"
796+
site_packages = "Lib/site-packages"
797797

798798
return _venv_details(
799799
interpreter = interpreter,
800800
pyvenv_cfg = None,
801-
venv_site_packages = venv_site_packages,
801+
site_packages = site_packages,
802802
bin_dir = venv_bin_ctx_rel_path,
803803
recreate_venv_at_runtime = True,
804804
interpreter_runfiles = interpreter_runfiles.build(ctx),
@@ -809,7 +809,7 @@ def _venv_details(
809809
*,
810810
interpreter,
811811
pyvenv_cfg,
812-
venv_site_packages,
812+
site_packages,
813813
bin_dir,
814814
recreate_venv_at_runtime,
815815
interpreter_runfiles,
@@ -822,7 +822,7 @@ def _venv_details(
822822
# it's expected that one will be created at runtime.
823823
pyvenv_cfg = pyvenv_cfg,
824824
# str; venv-relative path to the site-packages directory
825-
venv_site_packages = venv_site_packages,
825+
site_packages = site_packages,
826826
# str; ctx-relative path to the venv's bin directory.
827827
bin_dir = bin_dir,
828828
# bool; True if the venv needs to be recreated at runtime (because the

0 commit comments

Comments
 (0)