plain 0.42.0__py3-none-any.whl → 0.42.2__py3-none-any.whl

plain/logs/configure.py

@@ -14,19 +14,24 @@ def configure_logging(logging_settings):
             },
         },
         "handlers": {
-            "console": {
-                "level": "INFO",
+            "plain_console": {
+                "level": environ.get("PLAIN_LOG_LEVEL", "INFO"),
+                "class": "logging.StreamHandler",
+                "formatter": "simple",
+            },
+            "app_console": {
+                "level": environ.get("APP_LOG_LEVEL", "INFO"),
                 "class": "logging.StreamHandler",
                 "formatter": "simple",
             },
         },
         "loggers": {
             "plain": {
-                "handlers": ["console"],
+                "handlers": ["plain_console"],
                 "level": environ.get("PLAIN_LOG_LEVEL", "INFO"),
             },
             "app": {
-                "handlers": ["console"],
+                "handlers": ["app_console"],
                 "level": environ.get("APP_LOG_LEVEL", "INFO"),
                 "propagate": False,
             },

plain/urls/resolvers.py

@@ -103,7 +103,6 @@ class URLResolver:
         self.router = router
         self._reverse_dict = {}
         self._namespace_dict = {}
-        self._app_dict = {}
         self._populated = False
         self._local = local()
 
@@ -132,7 +131,6 @@ class URLResolver:
             self._local.populating = True
             lookups = MultiValueDict()
             namespaces = {}
-            packages = {}
             for url_pattern in reversed(self.url_patterns):
                 p_pattern = url_pattern.pattern.regex.pattern
                 p_pattern = p_pattern.removeprefix("^")
@@ -158,9 +156,6 @@ class URLResolver:
                 else:  # url_pattern is a URLResolver.
                     url_pattern._populate()
                     if url_pattern.namespace:
-                        packages.setdefault(url_pattern.namespace, []).append(
-                            url_pattern.namespace
-                        )
                         namespaces[url_pattern.namespace] = (p_pattern, url_pattern)
                     else:
                         for name in url_pattern.reverse_dict:
@@ -189,13 +184,7 @@ class URLResolver:
                             current_converters = url_pattern.pattern.converters
                             sub_pattern.pattern.converters.update(current_converters)
                             namespaces[namespace] = (p_pattern + prefix, sub_pattern)
-                        for (
-                            namespace,
-                            namespace_list,
-                        ) in url_pattern.app_dict.items():
-                            packages.setdefault(namespace, []).extend(namespace_list)
             self._namespace_dict = namespaces
-            self._app_dict = packages
             self._reverse_dict = lookups
             self._populated = True
         finally:
@@ -213,12 +202,6 @@ class URLResolver:
             self._populate()
         return self._namespace_dict
 
-    @property
-    def app_dict(self):
-        if not self._app_dict:
-            self._populate()
-        return self._app_dict
-
     @staticmethod
     def _join_route(route1, route2):
         """Join two routes, without the starting ^ in the second route."""

plain/urls/utils.py

@@ -4,57 +4,38 @@ from .exceptions import NoReverseMatch
 from .resolvers import get_ns_resolver, get_resolver
 
 
-def reverse(viewname, *args, **kwargs):
+def reverse(url_name: str, *args, **kwargs):
     resolver = get_resolver()
 
-    if not isinstance(viewname, str):
-        view = viewname
-    else:
-        *path, view = viewname.split(":")
-
-        current_path = None
-
-        resolved_path = []
-        ns_pattern = ""
-        ns_converters = {}
-        for ns in path:
-            current_ns = current_path.pop() if current_path else None
-            # Lookup the name to see if it could be an app identifier.
-            try:
-                app_list = resolver.app_dict[ns]
-                # Yes! Path part matches an app in the current Resolver.
-                if current_ns and current_ns in app_list:
-                    # If we are reversing for a particular app, use that
-                    # namespace.
-                    ns = current_ns
-                elif ns not in app_list:
-                    # The name isn't shared by one of the instances (i.e.,
-                    # the default) so pick the first instance as the default.
-                    ns = app_list[0]
-            except KeyError:
-                pass
-
-            if ns != current_ns:
-                current_path = None
-
-            try:
-                extra, resolver = resolver.namespace_dict[ns]
-                resolved_path.append(ns)
-                ns_pattern += extra
-                ns_converters.update(resolver.pattern.converters)
-            except KeyError as key:
-                if resolved_path:
-                    raise NoReverseMatch(
-                        "{} is not a registered namespace inside '{}'".format(
-                            key, ":".join(resolved_path)
-                        )
+    *path, view = url_name.split(":")
+
+    current_path = None
+
+    resolved_path = []
+    ns_pattern = ""
+    ns_converters = {}
+    for ns in path:
+        current_ns = current_path.pop() if current_path else None
+
+        if ns != current_ns:
+            current_path = None
+
+        try:
+            extra, resolver = resolver.namespace_dict[ns]
+            resolved_path.append(ns)
+            ns_pattern += extra
+            ns_converters.update(resolver.pattern.converters)
+        except KeyError as key:
+            if resolved_path:
+                raise NoReverseMatch(
+                    "{} is not a registered namespace inside '{}'".format(
+                        key, ":".join(resolved_path)
                     )
-                else:
-                    raise NoReverseMatch(f"{key} is not a registered namespace")
-        if ns_pattern:
-            resolver = get_ns_resolver(
-                ns_pattern, resolver, tuple(ns_converters.items())
-            )
+                )
+            else:
+                raise NoReverseMatch(f"{key} is not a registered namespace")
+    if ns_pattern:
+        resolver = get_ns_resolver(ns_pattern, resolver, tuple(ns_converters.items()))
 
     return resolver.reverse(view, *args, **kwargs)
 

{plain-0.42.0.dist-info → plain-0.42.2.dist-info}/METADATA

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

{plain-0.42.0.dist-info → plain-0.42.2.dist-info}/RECORD

@@ -67,7 +67,7 @@ plain/internal/middleware/https.py,sha256=XpuQK8HicYX1jNanQHqNgyQ9rqe4NLUOZO3ZzK
 plain/internal/middleware/slash.py,sha256=FMU8b9w0NSx4eJs9Y7Ew6RAoSTbUqe2oOM68kg3wOng,2817
 plain/logs/README.md,sha256=wXqqAQym4g6hUiJOothj-t0RacZLf2-o9JskoZhsehA,1276
 plain/logs/__init__.py,sha256=rASvo4qFBDIHfkACmGLNGa6lRGbG9PbNjW6FmBt95ys,168
-plain/logs/configure.py,sha256=6mV7d1IxkDYT3VBz61qhIj0Esuy5l5QdQfsHaGCfI6w,1063
+plain/logs/configure.py,sha256=2kDJ-WPv3PV4H46mz5tTfzIa2kvN6cjVlb3t-AEbMyk,1307
 plain/logs/loggers.py,sha256=iz9SYcwP9w5QAuwpULl48SFkVyJuuMoQ_fdLgdCHpNg,2121
 plain/logs/utils.py,sha256=9UzdCCQXJinGDs71Ngw297mlWkhgZStSd67ya4NOW98,1257
 plain/packages/README.md,sha256=nU2GcoCGmzmVOYRIeF8hp40aza0FF1ckvGqD5jIxocs,2494
@@ -108,9 +108,9 @@ plain/urls/__init__.py,sha256=DFO2OL1IllHW5USPIb5uYvvzf_G-Bl0Qu1zrRLHmWyM,542
 plain/urls/converters.py,sha256=s2JZVOdzZC16lgobsI93hygcdH5L0Kj4742WEkXsVcs,1193
 plain/urls/exceptions.py,sha256=q4iPh3Aa-zHbA-tw8v6WyX1J1n5WdAady2xvxFuyXB0,114
 plain/urls/patterns.py,sha256=7DxL5LWq40lI4hFxAJ2I4MyA3HrbCmNx_dHOk8yYiK8,8259
-plain/urls/resolvers.py,sha256=3I10pLpLvhL4NamABJGH8e5Se6Iqa2y7V6hMAFQxVSg,13264
+plain/urls/resolvers.py,sha256=sZsFQRPlPkogXIVSctZBXJaG0spJzuoJBmtOEZwIXXY,12630
 plain/urls/routers.py,sha256=iEsQtTpPNDDVn7r_BQX84FESGSjOeD5qgyO_ep5rzaU,2819
-plain/urls/utils.py,sha256=WiGq6hHI-5DLFOxCQTAZ2qm0J-UdGosLcjuxlfK6_Tg,2137
+plain/urls/utils.py,sha256=lKxTX_A3XJpIH7FjlNYju108stY6-8Sw2uVdiSsxOKQ,1249
 plain/utils/README.md,sha256=hRRkcg4CxMX-zz8d4Bn6V2uJr_VKgTLurc1jY7QlEx8,198
 plain/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plain/utils/cache.py,sha256=iuvOTIfI1s857iVOAPNLK5lkzlrl0fIiBYaiUXWQu40,5303
@@ -146,8 +146,8 @@ plain/views/forms.py,sha256=ESZOXuo6IeYixp1RZvPb94KplkowRiwO2eGJCM6zJI0,2400
 plain/views/objects.py,sha256=GGbcfg_9fPZ-PiaBwIHG2e__8GfWDR7JQtQ15wTyiHg,5970
 plain/views/redirect.py,sha256=daq2cQIkdDF78bt43sjuZxRAyJm_t_SKw6tyPmiXPIc,1985
 plain/views/templates.py,sha256=SU1fO9gVMp-gEQHYeFplxvmgeMyrLgT8MJ12WNVmQC8,2085
-plain-0.42.0.dist-info/METADATA,sha256=C3twqGn46rZA-SF4AzmsLnQMfuq5mO-CNTmzN_vv-PQ,4297
-plain-0.42.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain-0.42.0.dist-info/entry_points.txt,sha256=1Ys2lsSeMepD1vz8RSrJopna0RQfUd951vYvCRsvl6A,45
-plain-0.42.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
-plain-0.42.0.dist-info/RECORD,,
+plain-0.42.2.dist-info/METADATA,sha256=-2ueX6bhRxFuPq7x4GDGiML7MsQ93dY2ORRZe-FrutM,4297
+plain-0.42.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain-0.42.2.dist-info/entry_points.txt,sha256=1Ys2lsSeMepD1vz8RSrJopna0RQfUd951vYvCRsvl6A,45
+plain-0.42.2.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
+plain-0.42.2.dist-info/RECORD,,