Minor refactor

bugme.py

@@ -137,8 +137,8 @@ def _not_found(self, item_id: int, url: str, tag: str) -> Item:
             created=now,
             updated=now,
             url=url,
-            extra={},
             tag=tag,
+            extra={},
         )
 
     def get_item(self, item_id: int = -1, **kwargs) -> Item | None:
@@ -219,8 +219,8 @@ def _to_item(self, info: Any) -> Item:
             created=info.creation_time,
             updated=info.last_change_time,
             url=f"{self.url}/show_bug.cgi?id={info.id}",
-            extra=info.__dict__,
             tag=f"{self.tag}#{info.id}",
+            extra=info.__dict__,
         )
 
 
@@ -245,7 +245,7 @@ def get_item(self, item_id: int = -1, **kwargs) -> Item | None:
         try:
             info = self.client.get_repo(repo, lazy=True).get_issue(item_id)
         except (GithubException, RequestException) as exc:
-            if hasattr(exc, "status") and exc.status == 404:
+            if getattr(exc, "status", None) == 404:
                 return self._not_found(
                     item_id,
                     "{self.url}/{repo}/issues/{item_id}",
@@ -263,8 +263,8 @@ def _to_item(self, info: Any, repo: str) -> Item:
             created=info.created_at,
             updated=info.updated_at,
             url=f"{self.url}/{repo}/issues/{info.number}",
-            extra=info.__dict__["_rawData"],
             tag=f"{self.tag}#{repo}#{info.number}",
+            extra=info.__dict__["_rawData"],
         )
 
 
@@ -294,7 +294,7 @@ def get_item(self, item_id: int = -1, **kwargs) -> Item | None:
         try:
             info = self.client.projects.get(repo, lazy=True).issues.get(item_id)
         except (GitlabError, RequestException) as exc:
-            if hasattr(exc, "response_code") and exc.response_code == 404:
+            if getattr(exc, "response_code", None) == 404:
                 return self._not_found(
                     item_id,
                     f"{self.url}/{repo}/-/issues/{item_id}",
@@ -314,8 +314,8 @@ def _to_item(self, info: Any, repo: str) -> Item:
             created=info.created_at,
             updated=info.updated_at,
             url=f"{self.url}/{repo}/-/issues/{info.iid}",
-            extra=info.asdict(),
             tag=f"{self.tag}#{repo}#{info.iid}",
+            extra=info.asdict(),
         )
 
 
@@ -351,8 +351,8 @@ def _to_item(self, info: Any) -> Item:
             created=info.created_on,
             updated=info.updated_on,
             url=f"{self.url}/issues/{info.id}",
-            extra=info.raw(),
             tag=f"{self.tag}#{info.id}",
+            extra=info.raw(),
         )
 
 
@@ -448,17 +448,16 @@ def main() -> None:  # pylint: disable=too-many-branches
                 item.created = dateit(item.created, args.time)
                 item.updated = dateit(item.updated, args.time)
                 item.status = item.status.upper()
-                if args.output == "text":
-                    if args.format:
-                        print(Template(args.format).render(item.__dict__))
-                    else:
-                        print(
-                            "  ".join(
-                                [f"{item[key]:{align}}" for key, align in keys.items()]
-                            )
-                        )
-                elif args.output == "json":
+                if args.output == "json":
                     all_items.append(item.__dict__)
+                elif args.format:
+                    print(Template(args.format).render(item.__dict__))
+                else:
+                    print(
+                        "  ".join(
+                            [f"{item[key]:{align}}" for key, align in keys.items()]
+                        )
+                    )
 
     if args.output == "json":
         print(json.dumps(all_items, default=str, sort_keys=True))