plain 0.31.0__tar.gz → 0.32.1__tar.gz

{plain-0.31.0 → plain-0.32.1}/PKG-INFO

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

plain-0.32.1/plain/preflight/urls.py

@@ -0,0 +1,54 @@
+from plain.runtime import settings
+
+from . import Error, register
+
+
+@register
+def check_url_config(package_configs, **kwargs):
+    if getattr(settings, "URLS_ROUTER", None):
+        from plain.urls import get_resolver
+
+        resolver = get_resolver()
+        return check_resolver(resolver)
+
+    return []
+
+
+def check_resolver(resolver):
+    """
+    Recursively check the resolver.
+    """
+    check_method = getattr(resolver, "check", None)
+    if check_method is not None:
+        return check_method()
+    elif not hasattr(resolver, "resolve"):
+        return get_warning_for_invalid_pattern(resolver)
+    else:
+        return []
+
+
+def get_warning_for_invalid_pattern(pattern):
+    """
+    Return a list containing a warning that the pattern is invalid.
+
+    describe_pattern() cannot be used here, because we cannot rely on the
+    urlpattern having regex or name attributes.
+    """
+    if isinstance(pattern, str):
+        hint = (
+            f"Try removing the string '{pattern}'. The list of urlpatterns should not "
+            "have a prefix string as the first element."
+        )
+    elif isinstance(pattern, tuple):
+        hint = "Try using path() instead of a tuple."
+    else:
+        hint = None
+
+    return [
+        Error(
+            f"Your URL pattern {pattern!r} is invalid. Ensure that urlpatterns is a list "
+            "of path() and/or re_path() instances.",
+            hint=hint,
+            id="urls.E004",
+        )
+    ]

{plain-0.31.0 → plain-0.32.1}/plain/urls/patterns.py

@@ -48,7 +48,6 @@ class CheckURLMixin:
 class RegexPattern(CheckURLMixin):
     def __init__(self, regex, name=None, is_endpoint=False):
         self._regex = regex
-        self._regex_dict = {}
         self._is_endpoint = is_endpoint
         self.name = name
         self.converters = {}
@@ -157,7 +156,6 @@ def _route_to_regex(route, is_endpoint=False):
 class RoutePattern(CheckURLMixin):
     def __init__(self, route, name=None, is_endpoint=False):
         self._route = route
-        self._regex_dict = {}
         self._is_endpoint = is_endpoint
         self.name = name
         self.converters = _route_to_regex(str(route), is_endpoint)[1]

{plain-0.31.0 → plain-0.32.1}/pyproject.toml

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

plain-0.31.0/plain/preflight/urls.py

@@ -1,101 +0,0 @@
-from collections import Counter
-
-from plain.runtime import settings
-
-from . import Error, Warning, register
-
-
-@register
-def check_url_config(package_configs, **kwargs):
-    if getattr(settings, "URLS_ROUTER", None):
-        from plain.urls import get_resolver
-
-        resolver = get_resolver()
-        return check_resolver(resolver)
-
-    return []
-
-
-def check_resolver(resolver):
-    """
-    Recursively check the resolver.
-    """
-    check_method = getattr(resolver, "check", None)
-    if check_method is not None:
-        return check_method()
-    elif not hasattr(resolver, "resolve"):
-        return get_warning_for_invalid_pattern(resolver)
-    else:
-        return []
-
-
-@register
-def check_url_namespaces_unique(package_configs, **kwargs):
-    """
-    Warn if URL namespaces used in applications aren't unique.
-    """
-    if not getattr(settings, "URLS_ROUTER", None):
-        return []
-
-    from plain.urls import get_resolver
-
-    resolver = get_resolver()
-    all_namespaces = _load_all_namespaces(resolver)
-    counter = Counter(all_namespaces)
-    non_unique_namespaces = [n for n, count in counter.items() if count > 1]
-    errors = []
-    for namespace in non_unique_namespaces:
-        errors.append(
-            Warning(
-                f"URL namespace '{namespace}' isn't unique. You may not be able to reverse "
-                "all URLs in this namespace",
-                id="urls.W005",
-            )
-        )
-    return errors
-
-
-def _load_all_namespaces(resolver, parents=()):
-    """
-    Recursively load all namespaces from URL patterns.
-    """
-    url_patterns = getattr(resolver, "url_patterns", [])
-    namespaces = [
-        ":".join(parents + (url.namespace,))
-        for url in url_patterns
-        if getattr(url, "namespace", None) is not None
-    ]
-    for pattern in url_patterns:
-        namespace = getattr(pattern, "namespace", None)
-        current = parents
-        if namespace is not None:
-            current += (namespace,)
-        namespaces.extend(_load_all_namespaces(pattern, current))
-    return namespaces
-
-
-def get_warning_for_invalid_pattern(pattern):
-    """
-    Return a list containing a warning that the pattern is invalid.
-
-    describe_pattern() cannot be used here, because we cannot rely on the
-    urlpattern having regex or name attributes.
-    """
-    if isinstance(pattern, str):
-        hint = (
-            f"Try removing the string '{pattern}'. The list of urlpatterns should not "
-            "have a prefix string as the first element."
-        )
-    elif isinstance(pattern, tuple):
-        hint = "Try using path() instead of a tuple."
-    else:
-        hint = None
-
-    return [
-        Error(
-            f"Your URL pattern {pattern!r} is invalid. Ensure that urlpatterns is a list "
-            "of path() and/or re_path() instances.",
-            hint=hint,
-            id="urls.E004",
-        )
-    ]