Use gh-issue when both bpo and gh-issue exist.

Mariatta · Mariatta · commit ca5e522dd60c · 2022-04-07T12:25:42.000-07:00
diff --git a/blurb/blurb.py b/blurb/blurb.py
@@ -612,11 +612,11 @@ def _extract_next_filename(self):
         metadata, body = self[-1]
         metadata['section'] = sanitize_section(metadata['section'])
         metadata['root'] = root
-        if int(metadata["bpo"]) > 0 :
-            path = "{root}/Misc/NEWS.d/next/{section}/{date}.bpo-{bpo}.{nonce}.rst".format_map(metadata)
-        else:
-            # assume it's a GH issue number
+        if int(metadata["gh-issue"]) > 0 :
             path = "{root}/Misc/NEWS.d/next/{section}/{date}.gh-issue-{gh-issue}.{nonce}.rst".format_map(metadata)
+        elif int(metadata["bpo"]) > 0:
+            # assume it's a GH issue number
+            path = "{root}/Misc/NEWS.d/next/{section}/{date}.bpo-{bpo}.{nonce}.rst".format_map(metadata)
         for name in "root section date gh-issue bpo nonce".split():
             del metadata[name]
         return path
@@ -1114,7 +1114,7 @@ def print(*a, sep=" "):
                 issue_number = metadata['gh-issue']
                 if int(issue_number):
                     body = "gh-issue-" + issue_number + ": " + body
-            if metadata.get("bpo"):
+            elif metadata.get("bpo"):
                 issue_number = metadata['bpo']
                 if int(issue_number):
                     body = "bpo-" + issue_number + ": " + body
