modify flags attributes

Author: mai93

python/private/attributes.bzl

@@ -179,13 +179,6 @@ COMMON_ATTRS = dicts.add(
         # buildifier: disable=attr-license
         "licenses": attr.license() if hasattr(attr, "license") else attr.string_list(),
     },
-    # starlark flags attributes
-    {
-        "_build_python_zip": attr.label(default = "//python/config_settings:build_python_zip"),
-        "_default_to_explicit_init_py": attr.label(default = "//python/config_settings:incompatible_default_to_explicit_init_py"),
-        "_python_import_all_repositories": attr.label(default = "//python/config_settings:experimental_python_import_all_repositories"),
-        "_python_path": attr.label(default = "//python/config_settings:python_path"),
-    },
 )
 
 IMPORTS_ATTRS = {

python/private/flags.bzl

@@ -71,7 +71,7 @@ def read_possibly_native_flag(ctx, flag_name):
         return _POSSIBLY_NATIVE_FLAGS[flag_name][0](ctx)
     else:
         # Starlark definition of "--foo" is assumed to be a label dependency named "_foo".
-        return getattr(ctx.attr, "_" + flag_name)[BuildSettingInfo].value
+        return getattr(ctx.attr, "_" + flag_name + "_flag")[BuildSettingInfo].value
 
 def _AddSrcsToRunfilesFlag_is_enabled(ctx):
     value = ctx.attr._add_srcs_to_runfiles_flag[BuildSettingInfo].value

python/private/py_executable.bzl

@@ -77,6 +77,13 @@ EXECUTABLE_ATTRS = dicts.add(
     AGNOSTIC_EXECUTABLE_ATTRS,
     PY_SRCS_ATTRS,
     IMPORTS_ATTRS,
+    # starlark flags attributes
+    {
+        "_build_python_zip_flag": attr.label(default = "//python/config_settings:build_python_zip"),
+        "_default_to_explicit_init_py_flag": attr.label(default = "//python/config_settings:incompatible_default_to_explicit_init_py"),
+        "_python_import_all_repositories_flag": attr.label(default = "//python/config_settings:experimental_python_import_all_repositories"),
+        "_python_path_flag": attr.label(default = "//python/config_settings:python_path"),
+    },
     {
         "interpreter_args": lambda: attrb.StringList(
             doc = """