Use the cherry-picked 'full_version' helper

aignas · aignas · commit d8d4b8da58d4 · 2023-07-29T16:12:58.000+09:00
diff --git a/python/extensions/python.bzl b/python/extensions/python.bzl
@@ -15,8 +15,8 @@
 "Python toolchain module extensions for use with bzlmod"
 
 load("//python:repositories.bzl", "python_register_toolchains")
-load("//python:versions.bzl", "MINOR_MAPPING")
 load("//python/extensions/private:pythons_hub.bzl", "hub_repo")
+load("//python/private:full_version.bzl", "full_version")
 load("//python/private:toolchains_repo.bzl", "multi_toolchain_aliases")
 load("//python/private:version_label.bzl", "version_label")
 
@@ -76,10 +76,9 @@ def _python_impl(module_ctx):
         module_toolchain_versions = []
 
         for toolchain_attr in mod.tags.toolchain:
-            # TODO @aignas 2023-07-29: cherry-pick full_version helper
-            toolchain_version = MINOR_MAPPING.get(toolchain_attr.python_version, toolchain_attr.python_version)
-            toolchain_version_short = version_label(toolchain_version, sep = ".")
-            toolchain_name = "python_" + version_label(toolchain_version_short, sep = "_")
+            toolchain_version = full_version(toolchain_attr.python_version)
+            toolchain_version_short, _, _ = toolchain_version.rpartition(".")
+            toolchain_name = "python_" + version_label(toolchain_version, sep = "_")
 
             # Duplicate versions within a module indicate a misconfigured module.
             if toolchain_version_short in module_toolchain_versions:
