Check gh-issue- is int before checking range for better error

hugovk · hugovk · commit 8e590fcd3f5a · 2024-11-09T19:26:25.000+02:00
Invalid GitHub issue number! ('one-two')

instead of:

ValueError: invalid literal for int() with base 10: 'one-two'
diff --git a/src/blurb/blurb.py b/src/blurb/blurb.py
@@ -482,15 +482,15 @@ def finish_entry():
                 # we'll complain about the *first* error
                 # we see in the blurb file, which is a
                 # better user experience.
-                if key == "gh-issue" and int(value) < lowest_possible_gh_issue_number:
-                    throw(f"The gh-issue number must be {lowest_possible_gh_issue_number} or above, not a PR number.")
-
                 if key in issue_keys:
                     try:
                         int(value)
                     except (TypeError, ValueError):
                         throw(f"Invalid {issue_keys[key]} issue number! ({value!r})")
 
+                if key == "gh-issue" and int(value) < lowest_possible_gh_issue_number:
+                    throw(f"The gh-issue number must be {lowest_possible_gh_issue_number} or above, not a PR number.")
+
                 if key == "section":
                     if no_changes:
                         continue
diff --git a/tests/test_blurb.py b/tests/test_blurb.py
@@ -224,6 +224,10 @@ def test_parse():
             "..bpo: one-two\n..section: IDLE\nHello world!",
             r"Invalid bpo issue number! \('one-two'\)",
         ),
+        (
+            "..gh-issue: one-two\n..section: IDLE\nHello world!",
+            r"Invalid GitHub issue number! \('one-two'\)",
+        ),
         (
             "..gh-issue: 123456\n..section: Funky Kong\nHello world!",
             r"Invalid section 'Funky Kong'!  You must use one of the predefined sections",
