plain 0.22.0__tar.gz → 0.22.1__tar.gz

{plain-0.22.0 → plain-0.22.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain
-Version: 0.22.0
+Version: 0.22.1
 Summary: A web framework for building products with Python.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-File: LICENSE

{plain-0.22.0 → plain-0.22.1}/plain/urls/resolvers.py

@@ -97,7 +97,7 @@ def get_resolver(urls_module=None):
 
 @functools.cache
 def _get_cached_resolver(urls_module):
-    from .routers import routers
+    from .routers import routers_registry
 
     if isinstance(urls_module, str):
         # Need to trigger an import in order for the @register_router
@@ -105,7 +105,7 @@ def _get_cached_resolver(urls_module):
         # usually just for the root URLS_MODULE but could be for anything.
         urls_module = import_module(urls_module)
 
-    router = routers.get_module_router(urls_module)
+    router = routers_registry.get_module_router(urls_module)
     return URLResolver(pattern=RegexPattern(r"^/"), router_class=router)
 
 
@@ -139,11 +139,9 @@ class URLResolver:
         *,
         pattern,
         router_class,
-        namespace=None,
     ):
         self.pattern = pattern
         self.router_class = router_class
-        self.namespace = namespace
         self._reverse_dict = {}
         self._namespace_dict = {}
         self._app_dict = {}
@@ -320,6 +318,10 @@ class URLResolver:
         # Don't need to instantiate the class because they are just class attributes for now.
         return self.router_class.urls
 
+    @cached_property
+    def namespace(self):
+        return self.router_class.namespace
+
     def reverse(self, lookup_view, *args, **kwargs):
         if args and kwargs:
             raise ValueError("Don't mix *args and **kwargs in call to reverse()!")

{plain-0.22.0 → plain-0.22.1}/plain/urls/routers.py

@@ -1,12 +1,18 @@
+import re
 from abc import ABC
+from types import ModuleType
+from typing import TYPE_CHECKING
 
 from plain.exceptions import ImproperlyConfigured
 
-from .patterns import RoutePattern, URLPattern
+from .patterns import RegexPattern, RoutePattern, URLPattern
 from .resolvers import (
     URLResolver,
 )
 
+if TYPE_CHECKING:
+    from plain.views import View
+
 
 class RouterBase(ABC):
     namespace: str = ""
@@ -39,8 +45,18 @@ class RoutersRegistry:
             ) from e
 
 
-def include(route, module_or_urls, *, Pattern=RoutePattern):
-    pattern = Pattern(route, is_endpoint=False)
+def include(
+    route: str | re.Pattern, module_or_urls: list | tuple | str | ModuleType
+) -> URLResolver:
+    """
+    Include URLs from another module or a nested list of URL patterns.
+    """
+    if isinstance(route, str):
+        pattern = RoutePattern(route, is_endpoint=False)
+    elif isinstance(route, re.Pattern):
+        pattern = RegexPattern(route.pattern, is_endpoint=False)
+    else:
+        raise TypeError("include() route must be a string or regex")
 
     if isinstance(module_or_urls, list | tuple):
         # We were given an explicit list of sub-patterns,
@@ -48,24 +64,30 @@ def include(route, module_or_urls, *, Pattern=RoutePattern):
         class _IncludeRouter(RouterBase):
             urls = module_or_urls
 
-        return URLResolver(pattern=pattern, router_class=_IncludeRouter, namespace=None)
+        return URLResolver(pattern=pattern, router_class=_IncludeRouter)
     else:
         # We were given a module, so we need to look up the router for that module
         module = module_or_urls
-        router = routers.get_module_router(module)
-        namespace = router.namespace
+        router_class = routers_registry.get_module_router(module)
 
         return URLResolver(
             pattern=pattern,
-            router_class=router,
-            namespace=namespace,
+            router_class=router_class,
         )
 
 
-def path(route, view, *, name=None, Pattern=RoutePattern):
+def path(route: str | re.Pattern, view: "View", *, name: str = "") -> URLPattern:
+    """
+    Standard URL with a view.
+    """
     from plain.views import View
 
-    pattern = Pattern(route, name=name, is_endpoint=True)
+    if isinstance(route, str):
+        pattern = RoutePattern(route, name=name, is_endpoint=True)
+    elif isinstance(route, re.Pattern):
+        pattern = RegexPattern(route.pattern, name=name, is_endpoint=True)
+    else:
+        raise TypeError("path() route must be a string or regex")
 
     # You can't pass a View() instance to path()
     if isinstance(view, View):
@@ -86,5 +108,5 @@ def path(route, view, *, name=None, Pattern=RoutePattern):
     raise TypeError("view must be a View class or View.as_view()")
 
 
-routers = RoutersRegistry()
-register_router = routers.register_router
+routers_registry = RoutersRegistry()
+register_router = routers_registry.register_router

{plain-0.22.0 → plain-0.22.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain"
-version = "0.22.0"
+version = "0.22.1"
 description = "A web framework for building products with Python."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 readme = "README.md"

plain-0.22.0/.pytype/.gitignore

@@ -1,2 +0,0 @@
-# Automatically created by pytype
-*

plain-0.22.0/.pytype/.ninja_log

@@ -1,24 +0,0 @@
-# ninja log v5
-2	569	1737047894229075963	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/utils/hashable.pyi	5010e8b9806952aa
-569	1963	1737047895617238051	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/logs/utils.pyi	685d3284fe18db73
-1963	3388	1737047897034941817	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/logs/loggers.pyi	25ae904bf284660d
-3388	4932	1737047898584788735	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/logs/configure.pyi	dcfdc29539e4e806
-1	1328	1737047998551685761	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/utils/module_loading.pyi	2ff5dc31190c36e3
-1	1538	1737048902649678938	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/packages/config.pyi	c89c50532de00b3
-1538	2777	1737048903892639761	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/packages/__init__.pyi-1	a84e90ed3b62c5a4
-2777	4333	1737048905443676733	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/packages/registry.pyi-1	a56ce0c1ec10d86a
-4333	5845	1737048906955929860	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/runtime/user_settings.pyi-1	835ea6b06714855f
-5845	7119	1737048908234737879	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/packages/__init__.pyi	355a7df1b40889f4
-7119	8748	1737048909856341084	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/packages/registry.pyi	33490e0a6fcc981f
-1	1299	1737049110361795162	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/logs/__init__.pyi	7e2313244a1cd37b
-1299	2807	1737049111865183260	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/packages/registry.pyi-1	a56ce0c1ec10d86a
-2807	4286	1737049113345043128	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/runtime/user_settings.pyi-1	835ea6b06714855f
-4286	5827	1737049114883781300	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/packages/registry.pyi	33490e0a6fcc981f
-5827	7448	1737049116502968603	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/runtime/user_settings.pyi	3db10441099b85e4
-7448	9094	1737049118149977569	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/signals/dispatch/dispatcher.pyi	8e629cc780e2a02f
-9094	10484	1737049119545728620	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/internal/files/base.pyi	928c30c16d652b42
-10484	11023	1737049120092064305	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/forms/exceptions.pyi	813bbd8cccdd967
-11024	12358	1737049121420951559	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/forms/boundfield.pyi	94ef2d1b33c90496
-12358	13657	1737049122717735676	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/utils/dateparse.pyi	338cae12b9d0f878
-13657	15308	1737049124360630875	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/validators.pyi	fbd185c62774db54
-1	507	1737049215067500034	/Users/davegaeddert/Developer/dropseed/plain/plain/.pytype/pyi/utils/itercompat.pyi	e108a0be2b1293bf