Updated color.py and argparse_completion.py examples for cmd2 3.0.

Author: kmvanbrunt

examples/argparse_completion.py

@@ -3,11 +3,13 @@
 
 import argparse
 
+from rich.style import Style
 from rich.text import Text
 
 from cmd2 import (
     Cmd,
     Cmd2ArgumentParser,
+    Color,
     CompletionError,
     CompletionItem,
     with_argparser,
@@ -18,8 +20,8 @@
 
 
 class ArgparseCompletion(Cmd):
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
+    def __init__(self) -> None:
+        super().__init__(include_ipy=True)
         self.sport_item_strs = ['Bat', 'Basket', 'Basketball', 'Football', 'Space Ball']
 
     def choices_provider(self) -> list[str]:
@@ -39,7 +41,10 @@ def choices_completion_error(self) -> list[str]:
 
     def choices_completion_item(self) -> list[CompletionItem]:
         """Return CompletionItem instead of strings. These give more context to what's being tab completed."""
-        fancy_item = Text("These things can\ncontain newlines and\n") + Text("styled text!!", style="underline bright_yellow")
+        fancy_item = Text.assemble(
+            "These things can\ncontain newlines and\n",
+            Text("styled text!!", style=Style(color=Color.BRIGHT_YELLOW, underline=True)),
+        )
 
         items = {1: "My item", 2: "Another item", 3: "Yet another item", 4: fancy_item}
         return [CompletionItem(item_id, [description]) for item_id, description in items.items()]

examples/color.py

@@ -7,12 +7,10 @@
 import argparse
 
 from rich.style import Style
+from rich.text import Text
 
 import cmd2
-from cmd2 import (
-    Color,
-    stylize,
-)
+from cmd2 import Color
 
 
 class CmdLineApp(cmd2.Cmd):
@@ -31,17 +29,19 @@ def __init__(self) -> None:
     def do_taste_the_rainbow(self, args: argparse.Namespace) -> None:
         """Show all of the colors available within cmd2's Color StrEnum class."""
 
-        color_names = []
-        for color_member in Color:
-            style = Style(bgcolor=color_member) if args.background else Style(color=color_member)
-            styled_name = stylize(color_member.name, style=style)
-            if args.paged:
-                color_names.append(styled_name)
-            else:
-                self.poutput(styled_name)
+        def create_style(color: Color) -> Style:
+            """Create a foreground or background color Style."""
+            if args.background:
+                return Style(bgcolor=color)
+            return Style(color=color)
+
+        styled_names = [Text(color.name, style=create_style(color)) for color in Color]
+        output = Text("\n").join(styled_names)
 
         if args.paged:
-            self.ppaged('\n'.join(color_names))
+            self.ppaged(output)
+        else:
+            self.poutput(output)
 
 
 if __name__ == '__main__':