reorder methods

Author: aignas

python/private/version.bzl

@@ -518,6 +518,62 @@ def normalize_pep440(version):
         )
     return parser.context()["norm"]
 
+def version(version_str, strict = False):
+    """Parse a PEP4408 compliant version
+
+    See https://packaging.python.org/en/latest/specifications/binary-distribution-format/#escaping-and-unicode
+    and https://peps.python.org/pep-0440/
+
+    Args:
+      version_str: version string to be normalized according to PEP 440.
+      strict: fail if the version is invalid.
+
+    Returns:
+      string containing the normalized version.
+    """
+
+    parser = _new(version_str.strip(" " if strict else " .*"))  # PEP 440: Leading and Trailing Whitespace and .*
+
+    accept(parser, _is("v"), "")  # PEP 440: Preceding v character
+
+    parts = {}
+    fns = [
+        ("epoch", accept_epoch),
+        ("release", accept_release),
+        ("pre", accept_prerelease),
+        ("post", accept_postrelease),
+        ("dev", accept_devrelease),
+        ("local", accept_local),
+    ]
+
+    for p, fn in fns:
+        start = len(parser.context()["norm"])
+        fn(parser)
+        parts[p] = parser.context()["norm"][start:]
+
+    parts["norm"] = parser.context()["norm"]
+
+    is_prefix = version_str.endswith(".*")
+    parts["is_prefix"] = is_prefix
+    if is_prefix and (parts["local"] or parts["post"] or parts["dev"] or parts["pre"]):
+        if strict:
+            fail("local version part has been obtained, but only public segments can have prefix matches")
+
+        # https://peps.python.org/pep-0440/#public-version-identifiers
+        return None
+
+    if parser.input[parser.context()["start"]:]:
+        if strict:
+            fail(
+                "Failed to parse PEP 440 version identifier '%s'." % parser.input,
+                "Parse error at '%s'" % parser.input[parser.context()["start"]:],
+            )
+
+        # If we fail to parse the version return None
+        return None
+
+    return _new_version(**parts)
+
 def _pad_zeros(release, n):
     padding = n - len(release)
     if padding <= 0:
@@ -752,59 +808,3 @@ def _new_version(*, epoch = 0, release, pre = "", post = "", dev = "", local = "
     )
 
     return self
-
-def version(version_str, strict = False):
-    """Parse a PEP4408 compliant version
-
-    See https://packaging.python.org/en/latest/specifications/binary-distribution-format/#escaping-and-unicode
-    and https://peps.python.org/pep-0440/
-
-    Args:
-      version_str: version string to be normalized according to PEP 440.
-      strict: fail if the version is invalid.
-
-    Returns:
-      string containing the normalized version.
-    """
-
-    parser = _new(version_str.strip(" " if strict else " .*"))  # PEP 440: Leading and Trailing Whitespace and .*
-
-    accept(parser, _is("v"), "")  # PEP 440: Preceding v character
-
-    parts = {}
-    fns = [
-        ("epoch", accept_epoch),
-        ("release", accept_release),
-        ("pre", accept_prerelease),
-        ("post", accept_postrelease),
-        ("dev", accept_devrelease),
-        ("local", accept_local),
-    ]
-
-    for p, fn in fns:
-        start = len(parser.context()["norm"])
-        fn(parser)
-        parts[p] = parser.context()["norm"][start:]
-
-    parts["norm"] = parser.context()["norm"]
-
-    is_prefix = version_str.endswith(".*")
-    parts["is_prefix"] = is_prefix
-    if is_prefix and (parts["local"] or parts["post"] or parts["dev"] or parts["pre"]):
-        if strict:
-            fail("local version part has been obtained, but only public segments can have prefix matches")
-
-        # https://peps.python.org/pep-0440/#public-version-identifiers
-        return None
-
-    if parser.input[parser.context()["start"]:]:
-        if strict:
-            fail(
-                "Failed to parse PEP 440 version identifier '%s'." % parser.input,
-                "Parse error at '%s'" % parser.input[parser.context()["start"]:],
-            )
-
-        # If we fail to parse the version return None
-        return None
-
-    return _new_version(**parts)