muffin 1.1.0__py3-none-any.whl → 1.1.2__py3-none-any.whl

muffin/manage.py

@@ -86,7 +86,7 @@ class Manager:
 
         # We have to use sync mode here because of eventloop conflict with ipython/promt-toolkit
         def shell(*, ipython: bool = True):
-            """Start the application's shell.
+            """Start an interactive shell with the application context.
 
             :param ipython: Use IPython as a shell
             """
@@ -108,7 +108,7 @@ class Manager:
         self(shell)
 
         def run(host: str = "localhost", port: int = 5000):
-            """Start the application's server."""
+            """Run the application with the given host and port."""
             from uvicorn.main import run as urun
 
             cfg = self.app.cfg
@@ -235,6 +235,14 @@ class Manager:
         if prog:
             self.parser.prog = prog
 
+        # Sort subparsers by name
+        choices_actions = getattr(self.subparsers, "_choices_actions", None)
+        if choices_actions:
+            sorted_actions = sorted(choices_actions, key=lambda a: a.dest)
+            choices_actions.clear()
+            choices_actions.extend(sorted_actions)
+            self.subparsers.metavar = "{" + ",".join(a.dest for a in sorted_actions) + "}"
+
         ns, _ = self.parser.parse_known_args(args or sys.argv[1:])
         kwargs = dict(ns._get_kwargs())
         fn = self.commands.get(kwargs.pop("subparser"))
@@ -245,7 +253,11 @@ class Manager:
             self.parser.print_help()
             sys.exit(1)
 
-        pargs = kwargs.pop("*", [])
+        pargs = []
+        sig = inspect.signature(fn)
+        for name, param in sig.parameters.items():
+            if param.kind == param.VAR_POSITIONAL:
+                pargs.extend(kwargs.pop(name, []))
 
         if not inspect.iscoroutinefunction(fn):
             return fn(*pargs, **kwargs)
@@ -282,7 +294,7 @@ def cli():
         app = import_app(args_.app)
         app.logger.info("Application is loaded: %s", app.cfg.name)
 
-    except ImportError:
+    except (ImportError, ModuleNotFoundError):
         logging.exception("Failed to import application")
         return sys.exit(1)
 

{muffin-1.1.0.dist-info → muffin-1.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: muffin
-Version: 1.1.0
+Version: 1.1.2
 Summary: Muffin is a fast, simple and asyncronous web-framework for Python 3 (asyncio, trio, curio)
 License: MIT
 Keywords: asgi,web,web framework,asyncio,trio,curio

{muffin-1.1.0.dist-info → muffin-1.1.2.dist-info}/RECORD

@@ -3,13 +3,13 @@ muffin/app.py,sha256=6gPJUhWn9QSdzSwIl_8eP1uwOGaFIkHI-aXQrYwU1gY,5318
 muffin/constants.py,sha256=Ga1UJiEdXUk6dIEH_IEVYkFSZxQFPhxie7fCJwQY8V0,71
 muffin/errors.py,sha256=I-vKbMMBiMU07zPdKvoJKqA7s4xYAUA-4oZXrRMRzcM,701
 muffin/handler.py,sha256=_cvF0TV87YH5_ZDnwgsks-h_e0yI14P27j4HG5tWanc,3673
-muffin/manage.py,sha256=bXJqQf0pHjtgn3lyKqcvP9SBlh67v5vhQE3oZopF5JY,9663
+muffin/manage.py,sha256=NWtjR8NfJ6O7-K3xZe2yWOmFO_ZUIyYO4VTGq20KWso,10295
 muffin/plugins.py,sha256=fGIocty5hHGTTY3zQrYBvkXjETlLndqRwAe5jmpyi3I,3417
 muffin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 muffin/pytest.py,sha256=51pJ-JJ2vwqiPhR9TPqXvT78X35l3v3oEkN5LBnfY8E,2679
 muffin/types.py,sha256=wsUj5oAfqSZMoEf-wyFJLBlWa8Mc-eJGqKLr02HxuXE,153
 muffin/utils.py,sha256=O3JXRkFyDlZ3kJZeaHz2WHMTY6-lvHGDu7qFy0x8Zls,2896
-muffin-1.1.0.dist-info/METADATA,sha256=gq18wriPaxEZAy8-EOpKeXEdyzFwBwkklgzZ2OIh9rk,6243
-muffin-1.1.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-muffin-1.1.0.dist-info/entry_points.txt,sha256=GvPS3M-tNVPzhUS5jnUpOmWw2NAqedY34VRCYgPYzlM,84
-muffin-1.1.0.dist-info/RECORD,,
+muffin-1.1.2.dist-info/METADATA,sha256=Ot4Jz08JJA-E7osf0u8d3qkI4lVCOcxCLE52pEoUDyk,6243
+muffin-1.1.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+muffin-1.1.2.dist-info/entry_points.txt,sha256=GvPS3M-tNVPzhUS5jnUpOmWw2NAqedY34VRCYgPYzlM,84
+muffin-1.1.2.dist-info/RECORD,,