fixup function changes

Author: rickeylev

python/private/py_library.bzl

@@ -25,16 +25,9 @@ load(
     "REQUIRED_EXEC_GROUP_BUILDERS",
 )
 load(":builders.bzl", "builders")
-load(
-    ":common.bzl",
-    "collect_imports",
-    "collect_runfiles",
-    "create_instrumented_files_info",
-    "create_output_group_info",
-    "create_py_info",
-    "filter_to_py_srcs",
-)
+load(":common.bzl", "collect_cc_info", "collect_imports", "collect_runfiles", "create_instrumented_files_info", "create_library_semantics_struct", "create_output_group_info", "create_py_info", "filter_to_py_srcs", "get_imports")
 load(":flags.bzl", "AddSrcsToRunfilesFlag", "PrecompileFlag")
+load(":precompile.bzl", "maybe_precompile")
 load(":py_cc_link_params_info.bzl", "PyCcLinkParamsInfo")
 load(":py_internal.bzl", "py_internal")
 load(":rule_builders.bzl", "ruleb")
@@ -57,6 +50,16 @@ LIBRARY_ATTRS = dicts.add(
     },
 )
 
+def _py_library_impl_with_semantics(ctx):
+    return py_library_impl(
+        ctx,
+        semantics = create_library_semantics_struct(
+            get_imports = get_imports,
+            maybe_precompile = maybe_precompile,
+            get_cc_info_for_library = collect_cc_info,
+        ),
+    )
+
 def py_library_impl(ctx, *, semantics):
     """Abstract implementation of py_library rule.
 
@@ -156,8 +159,9 @@ def create_py_library_rule_builder():
         for creating a `py_library` rule.
     """
     builder = ruleb.Rule(
+        implementation = _py_library_impl_with_semantics,
         doc = _DEFAULT_PY_LIBRARY_DOC,
-        exec_groups = REQUIRED_EXEC_GROUP_BUILDERS,
+        exec_groups = dict(REQUIRED_EXEC_GROUP_BUILDERS),
         attrs = LIBRARY_ATTRS,
         fragments = ["py"],
         toolchains = [

python/private/py_library_rule.bzl

@@ -13,20 +13,6 @@
 # limitations under the License.
 """Implementation of py_library rule."""
 
-load(":common.bzl", "collect_cc_info", "create_library_semantics_struct", "get_imports")
-load(":precompile.bzl", "maybe_precompile")
-load(":py_library.bzl", "create_py_library_rule_builder", "py_library_impl")
+load(":py_library.bzl", "create_py_library_rule_builder")
 
-def _py_library_impl_with_semantics(ctx):
-    return py_library_impl(
-        ctx,
-        semantics = create_library_semantics_struct(
-            get_imports = get_imports,
-            maybe_precompile = maybe_precompile,
-            get_cc_info_for_library = collect_cc_info,
-        ),
-    )
-
-py_library = create_py_library_rule_builder(
-    implementation = _py_library_impl_with_semantics,
-).build()
+py_library = create_py_library_rule_builder().build()

tests/support/sh_py_run_test.bzl

@@ -20,9 +20,9 @@ without the overhead of a bazel-in-bazel integration test.
 load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("//python/private:attr_builders.bzl", "attrb")  # buildifier: disable=bzl-visibility
 load("//python/private:py_binary_macro.bzl", "py_binary_macro")  # buildifier: disable=bzl-visibility
-load("//python/private:py_binary_rule.bzl", "create_binary_rule_builder")  # buildifier: disable=bzl-visibility
+load("//python/private:py_binary_rule.bzl", "create_py_binary_rule_builder")  # buildifier: disable=bzl-visibility
 load("//python/private:py_test_macro.bzl", "py_test_macro")  # buildifier: disable=bzl-visibility
-load("//python/private:py_test_rule.bzl", "create_test_rule_builder")  # buildifier: disable=bzl-visibility
+load("//python/private:py_test_rule.bzl", "create_py_test_rule_builder")  # buildifier: disable=bzl-visibility
 load("//python/private:toolchain_types.bzl", "TARGET_TOOLCHAIN_TYPE")  # buildifier: disable=bzl-visibility
 load("//tests/support:support.bzl", "VISIBLE_FOR_TESTING")
 
@@ -79,9 +79,9 @@ def _create_reconfig_rule(builder):
     builder.cfg.update_outputs(_RECONFIG_OUTPUTS)
     return builder.build()
 
-_py_reconfig_binary = _create_reconfig_rule(create_binary_rule_builder())
+_py_reconfig_binary = _create_reconfig_rule(create_py_binary_rule_builder())
 
-_py_reconfig_test = _create_reconfig_rule(create_test_rule_builder())
+_py_reconfig_test = _create_reconfig_rule(create_py_test_rule_builder())
 
 def py_reconfig_test(**kwargs):
     """Create a py_test with customized build settings for testing.