Refactor some codes by adding utils.to_tuple function.

Author: Tim-ats-d

visualdialog/box.py

@@ -9,7 +9,7 @@
 from typing import List, Literal, Sequence, Tuple, Union
 
 from .type import CursesKey, CursesTextAttribute, CursesTextAttributes, CursesWindow
-from .utils import TextAttr
+from .utils import TextAttr, to_tuple
 
 
 class PanicError(Exception):
@@ -101,12 +101,8 @@ def __init__(
         self.title = title
         if title:
             self.title_colors = curses.color_pair(title_colors_pair_nb)
-
-            # Test if only one argument is passed instead of a tuple
-            if isinstance(title_text_attr, int):
-                self.title_text_attr = (title_text_attr, )
-            else:
-                self.title_text_attr = title_text_attr
+            # Test if only one argument is passed instead of a sequence.
+            self.title_text_attr = to_tuple(title_text_attr)
 
         self.downtime_chars = downtime_chars
         self.downtime_chars_delay = downtime_chars_delay

visualdialog/dialog.py

@@ -10,7 +10,7 @@
 
 from .box import BaseTextBox
 from .type import CursesTextAttribute, CursesTextAttributes, CursesWindow
-from .utils import TextAttr, chunked
+from .utils import TextAttr, chunked, to_tuple
 
 
 class DialogBox(BaseTextBox):
@@ -176,10 +176,7 @@ def _one_by_one(self,
                 offsetting_x = 0
                 for word in line.split(word_delimiter):
                     if word in words_attr:
-                        attr = words_attr[word]
-
-                        if isinstance(attr, int):
-                            attr = (attr, )
+                        attr = to_tuple(words_attr[word])
                     else:
                         attr = (colors_pair, *text_attr)
 

visualdialog/utils.py

@@ -4,7 +4,7 @@
 __all__ = ["TextAttr"]
 
 from contextlib import ContextDecorator
-from typing import Iterable, NoReturn, Sequence
+from typing import Iterable, NoReturn, Sequence, Tuple, Union
 
 from .type import CursesTextAttribute, CursesWindow
 
@@ -21,6 +21,16 @@ def chunked(seq: Sequence,
             for chunk in range(0, len(seq), chunk_length))
 
 
+def to_tuple(obj: Union[object, Sequence]) -> Union[Tuple, Sequence]:
+    """Check if the given object is a sequence, if so returns it,
+    otherwise returns it as a tuple.
+    """
+    if isinstance(obj, Sequence):
+        return obj
+    else:
+        return (obj, )
+
+
 class TextAttr(ContextDecorator):
     """A context manager to manage ``curses`` text attributes.