Fix linting and formatting issues, ensure tests pass

Author: Gopinath-Mahendiran

zulipterminal/api_types.py

@@ -1,6 +1,7 @@
 """
 Types from the Zulip API, translated into python, to improve type checking
 """
+
 # NOTE: Only modify this file if it leads to a better match to the types used
 #       in the API at http://zulip.com/api
 

zulipterminal/cli/run.py

@@ -695,4 +695,4 @@ def print_setting(setting: str, data: SettingData, suffix: str = "") -> None:
 
 
 if __name__ == "__main__":
-    main()
+    main()

zulipterminal/config/keys.py

@@ -548,9 +548,11 @@ def display_key_for_urwid_key(urwid_key: str) -> str:
         if urwid_map_key in urwid_key:
             urwid_key = urwid_key.replace(urwid_map_key, display_map_key)
     display_key = [
-        keyboard_key.capitalize()
-        if len(keyboard_key) > 1 and keyboard_key[0].islower()
-        else keyboard_key
+        (
+            keyboard_key.capitalize()
+            if len(keyboard_key) > 1 and keyboard_key[0].islower()
+            else keyboard_key
+        )
         for keyboard_key in urwid_key.split()
     ]
     return " ".join(display_key)

zulipterminal/config/themes.py

@@ -1,21 +1,22 @@
 """
 Styles and their colour mappings in each theme, with helper functions
 """
+
 from typing import Any, Dict, List, Optional, Tuple, Union
 
 from pygments.token import STANDARD_TYPES, _TokenType
 
 from zulipterminal.config.color import Background, term16
 from zulipterminal.themes import (
-    gruvbox_dark_high_contrast,
     gruvbox_dark,
-    gruvbox_light,
-    zt_blue, zt_dark, 
-    zt_light, 
+    gruvbox_dark_high_contrast,
     gruvbox_dark_low_contrast,
+    gruvbox_light,
     gruvbox_light_high_contrast,
-    gruvbox_light_low_contrast
-
+    gruvbox_light_low_contrast,
+    zt_blue,
+    zt_dark,
+    zt_light,
 )
 
 
@@ -109,8 +110,7 @@
     "gruvbox_dark_high_contrast": gruvbox_dark_high_contrast,
     "gruvbox_dark_low_contrast": gruvbox_dark_low_contrast,
     "gruvbox_light_high_contrast": gruvbox_light_high_contrast,
-    "gruvbox_light_low_contrast": gruvbox_light_low_contrast,   
-    # "sample": sample,
+    "gruvbox_light_low_contrast": gruvbox_light_low_contrast,
 }
 
 # These are older aliases to some of the above, for compatibility

zulipterminal/core.py

@@ -119,9 +119,11 @@ def __init__(
         # Register new ^C handler
         signal.signal(
             signal.SIGINT,
-            self.prompting_exit_handler
-            if self.exit_confirmation
-            else self.no_prompt_exit_handler,
+            (
+                self.prompting_exit_handler
+                if self.exit_confirmation
+                else self.no_prompt_exit_handler
+            ),
         )
 
     def raise_exception_in_main_thread(
@@ -745,4 +747,4 @@ def main(self) -> None:
 
         finally:
             self.restore_stdout()
-            self.loop.screen.tty_signal_keys(*old_signal_list)
+            self.loop.screen.tty_signal_keys(*old_signal_list)

zulipterminal/helper.py

@@ -171,9 +171,11 @@ def sort_unread_topics(
     return sorted(
         unread_topics.keys(),
         key=lambda stream_topic: (
-            stream_list.index(stream_topic[0])
-            if stream_topic[0] in stream_list
-            else len(stream_list),
+            (
+                stream_list.index(stream_topic[0])
+                if stream_topic[0] in stream_list
+                else len(stream_list)
+            ),
             stream_topic[1],
         ),
     )

zulipterminal/model.py

@@ -1405,7 +1405,7 @@ def toggle_stream_muted_status(self, stream_id: int) -> None:
             SubscriptionSettingChange(
                 stream_id=stream_id,
                 property="is_muted",
-                value=not self.is_muted_stream(stream_id)
+                value=not self.is_muted_stream(stream_id),
                 # True for muting and False for unmuting.
             )
         ]

zulipterminal/themes/colors_gruvbox.py

@@ -8,6 +8,7 @@
 For color reference see:
     https://github.com/morhetz/gruvbox/blob/master/colors/gruvbox.vim
 """
+
 from enum import Enum
 
 from zulipterminal.config.color import color_properties
@@ -81,4 +82,4 @@ class GruvBoxColor(Enum):
 # fmt: on
 
 
-DefaultBoldColor = color_properties(GruvBoxColor, "BOLD")
+DefaultBoldColor = color_properties(GruvBoxColor, "BOLD")

zulipterminal/themes/gruvbox_dark.py

@@ -4,6 +4,7 @@
 This theme uses the default color scheme.
 For further details on themefiles look at the theme contribution guide.
 """
+
 from pygments.styles.material import MaterialStyle
 
 from zulipterminal.config.color import Background
@@ -88,4 +89,4 @@
         }
     }
 }
-# fmt: on
+# fmt: on

zulipterminal/themes/gruvbox_dark_high_contrast.py

@@ -98,4 +98,4 @@
         }
     }
 }
-# fmt: on
+# fmt: on

zulipterminal/themes/gruvbox_dark_low_contrast.py

@@ -98,4 +98,4 @@
         }
     }
 }
-# fmt: on
+# fmt: on

zulipterminal/themes/gruvbox_light.py

@@ -8,6 +8,7 @@
 
 For further details on themefiles look at the theme contribution guide
 """
+
 from pygments.styles.solarized import SolarizedLightStyle
 
 from zulipterminal.config.color import Background

zulipterminal/themes/gruvbox_light_high_contrast.py

@@ -98,4 +98,4 @@
         }
     }
 }
-# fmt: on
+# fmt: on

zulipterminal/themes/gruvbox_light_low_contrast.py

@@ -98,4 +98,4 @@
         }
     }
 }
-# fmt: on
+# fmt: on

zulipterminal/themes/zt_blue.py

@@ -4,6 +4,7 @@
 This theme uses the default color scheme.
 For further details on themefiles look at the theme contribution guide
 """
+
 from pygments.styles.zenburn import ZenburnStyle
 
 from zulipterminal.config.color import Background

zulipterminal/themes/zt_dark.py

@@ -4,6 +4,7 @@
 This theme uses the default color scheme.
 For further details on themefiles look at the theme contribution guide.
 """
+
 from pygments.styles.material import MaterialStyle
 
 from zulipterminal.config.color import Background

zulipterminal/themes/zt_light.py

@@ -4,6 +4,7 @@
 This theme uses the default color scheme.
 For further details on themefiles look at the theme contribution guide.
 """
+
 from pygments.styles.perldoc import PerldocStyle
 
 from zulipterminal.config.color import Background

zulipterminal/ui_tools/boxes.py

@@ -581,9 +581,11 @@ def autocomplete_users(
 
         # Append user_id's to users with the same names.
         user_names_with_distinct_duplicates = [
-            f"{user['full_name']}|{user['user_id']}"
-            if user_names_counter[user["full_name"]] > 1
-            else user["full_name"]
+            (
+                f"{user['full_name']}|{user['user_id']}"
+                if user_names_counter[user["full_name"]] > 1
+                else user["full_name"]
+            )
             for user in sorted_matching_users
         ]
 

zulipterminal/ui_tools/messages.py

@@ -285,12 +285,16 @@ def reactions_view(
 
             reaction_texts = [
                 (
-                    "reaction_mine"
-                    if my_user_id in [id[0] for id in ids]
-                    else "reaction",
-                    f" :{reaction}: {len(ids)} "
-                    if len(reactions) > MAXIMUM_USERNAMES_VISIBLE
-                    else f" :{reaction}: {', '.join([id[1] for id in ids])} ",
+                    (
+                        "reaction_mine"
+                        if my_user_id in [id[0] for id in ids]
+                        else "reaction"
+                    ),
+                    (
+                        f" :{reaction}: {len(ids)} "
+                        if len(reactions) > MAXIMUM_USERNAMES_VISIBLE
+                        else f" :{reaction}: {', '.join([id[1] for id in ids])} "
+                    ),
                 )
                 for reaction, ids in reaction_stats.items()
             ]
@@ -837,9 +841,7 @@ def update_message_author_status(self) -> bool:
         return author_is_present
 
     @classmethod
-    def transform_content(
-        cls, content: Any, server_url: str
-    ) -> Tuple[
+    def transform_content(cls, content: Any, server_url: str) -> Tuple[
         Tuple[None, Any],
         Dict[str, Tuple[str, int, bool]],
         List[Tuple[str, str]],

zulipterminal/unicode_emojis.py

@@ -1,6 +1,7 @@
 """
 Unicode emoji data, synchronized semi-regularly with the server source
 """
+
 # Ignore long lines
 # ruff: noqa: E501