k3shell 0.1.1__tar.gz → 0.1.3__tar.gz

{k3shell-0.1.1 → k3shell-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: k3shell
-Version: 0.1.1
+Version: 0.1.3
 Summary: Shell command dispatcher with nested subcommand support
 Author-email: Zhang Yanpo <drdr.xp@gmail.com>
 License: MIT
@@ -24,6 +24,7 @@ Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: coverage; extra == "dev"
+Requires-Dist: k3ut; extra == "dev"
 Provides-Extra: publish
 Requires-Dist: build; extra == "publish"
 Requires-Dist: twine; extra == "publish"

{k3shell-0.1.1 → k3shell-0.1.3}/k3shell.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: k3shell
-Version: 0.1.1
+Version: 0.1.3
 Summary: Shell command dispatcher with nested subcommand support
 Author-email: Zhang Yanpo <drdr.xp@gmail.com>
 License: MIT
@@ -24,6 +24,7 @@ Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: coverage; extra == "dev"
+Requires-Dist: k3ut; extra == "dev"
 Provides-Extra: publish
 Requires-Dist: build; extra == "publish"
 Requires-Dist: twine; extra == "publish"

{k3shell-0.1.1 → k3shell-0.1.3}/k3shell.egg-info/requires.txt

@@ -4,6 +4,7 @@ k3dict
 pytest>=7.0
 ruff
 coverage
+k3ut
 
 [docs]
 mkdocs>=1.5

{k3shell-0.1.1 → k3shell-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "k3shell"
-version = "0.1.1"
+version = "0.1.3"
 description = "Shell command dispatcher with nested subcommand support"
 readme = "README.md"
 license = {text = "MIT"}
@@ -37,6 +37,7 @@ dev = [
     "pytest>=7.0",
     "ruff",
     "coverage",
+    "k3ut",
 ]
 publish = [
     "build",

{k3shell-0.1.1 → k3shell-0.1.3}/test/test_k3shell.py

@@ -7,6 +7,9 @@ import logging
 import sys
 import k3shell
 
+# Python 3.10+ changed argparse help text from "optional arguments:" to "options:"
+OPTARGS = "options:\n" if sys.version_info >= (3, 10) else "optional arguments:\n"
+
 
 class TestCommand(unittest.TestCase):
     def setUp(self):
@@ -74,11 +77,14 @@ class TestCommand(unittest.TestCase):
             self.execute_test(arguments, argv, out_str, exit_code)
 
     def test_command_execute_error(self):
+        # Note: Lambda names in error messages include qualified path in Python 3.10+
+        # e.g., "TestCommand.test_command_execute_error.<locals>.<lambda>()"
+        # So we only check for the error type prefix
         testcases = (
             (
                 {"divi": lambda x, y: int(x) / int(y)},
                 ["divi"],
-                "TypeError(\"<lambda>() missing 2 required positional arguments: 'x' and 'y'\"",
+                'TypeError("',
                 1,
             ),
             (
@@ -88,7 +94,7 @@ class TestCommand(unittest.TestCase):
                     },
                 },
                 ["mod", "mod_2"],
-                "TypeError(\"<lambda>() missing 1 required positional argument: 'x'\"",
+                'TypeError("',
                 1,
             ),
             (
@@ -182,7 +188,7 @@ class TestCommand(unittest.TestCase):
                 + '    foo bar             print a "bar".\n'
                 + "    foo bob plus        do addition operation with 2 numbers.\n"
                 + "\n"
-                + "optional arguments:\n"
+                + OPTARGS
                 + "  -h, --help            show this help message and exit\n",
                 0,
                 "use -h to get help message",
@@ -194,17 +200,14 @@ class TestCommand(unittest.TestCase):
                 + "positional arguments:\n"
                 + "  x           just an input message\n"
                 + "\n"
-                + "optional arguments:\n"
+                + OPTARGS
                 + "  -h, --help  show this help message and exit\n",
                 0,
                 "use valid command and -h to get parameter help message",
             ),
             (
                 ["foo", "bar", "-h"],
-                "usage: python foo bar [-h]\n"
-                + "\n"
-                + "optional arguments:\n"
-                + "  -h, --help  show this help message and exit\n",
+                "usage: python foo bar [-h]\n" + "\n" + OPTARGS + "  -h, --help  show this help message and exit\n",
                 0,
                 "use valid command and -h to get parameter help message when no parameter setted.",
             ),
@@ -216,7 +219,7 @@ class TestCommand(unittest.TestCase):
                 + "  x           an int is needed\n"
                 + "  y           an int is needed\n"
                 + "\n"
-                + "optional arguments:\n"
+                + OPTARGS
                 + "  -h, --help  show this help message and exit\n",
                 0,
                 "use valid command and -h to get parameter help message when many parameters setted.",