wizlib 3.0.0__tar.gz → 3.0.1__tar.gz

{wizlib-3.0.0 → wizlib-3.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wizlib
-Version: 3.0.0
+Version: 3.0.1
 Summary: Framework for flexible and powerful command-line applications
 License: MIT
 Author: Steampunk Wizard

{wizlib-3.0.0 → wizlib-3.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wizlib"
-version = "3.0.0"
+version = "3.0.1"
 description = "Framework for flexible and powerful command-line applications"
 authors = ["Steampunk Wizard <wizlib@steampunkwizard.ca>"]
 license = "MIT"

{wizlib-3.0.0 → wizlib-3.0.1}/wizlib/command.py

@@ -1,3 +1,5 @@
+# Note that commands once used dataclass, but no longer.
+
 from argparse import ArgumentParser
 from pathlib import Path
 
@@ -16,8 +18,7 @@ class WizCommand(ClassFamily, SuperWrapper):
     """Define all the args you want, but stdin always works."""
 
     status = ''
-    handlers = []
-    ui: UI = None
+    handlers = []  # TODO: Move to app
 
     @classmethod
     def add_args(self, parser):

{wizlib-3.0.0 → wizlib-3.0.1}/wizlib/ui/__init__.py

@@ -127,12 +127,12 @@ class Chooser(Prompt):
         self.choices.append(choice)
 
     def choice_by_key(self, key):
-        if key == '\n':
-            choice = self.default
+        if key == '\n' and self.default:
+            choice = self.choices[0].value
         else:
             choice = next(
                 (o.value for o in self.choices if key in o.keys), None)
-        return choice() if callable(choice) else choice
+        return choice
 
     def choices_by_text(self, text):
         return [o.value for o in self.choices if o.hit_text(text)]

{wizlib-3.0.0 → wizlib-3.0.1}/wizlib/ui/shell_ui.py

@@ -54,7 +54,7 @@ class ShellUI(UI):
             self.send(out, emphasis=emphasis)
             if choice is not None:
                 break
-        return choice
+        return choice() if callable(choice) else choice
 
     def get_text(self, prompt='', choices=[], default=''):
         """Allow the user to input an arbitrary line of text, with possible tab