plain 0.2.5__tar.gz → 0.3.1__tar.gz

{plain-0.2.5 → plain-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plain
-Version: 0.2.5
+Version: 0.3.1
 Summary: A web framework for building products with Python.
 Author: Dave Gaeddert
 Author-email: dave.gaeddert@dropseed.dev

{plain-0.2.5 → plain-0.3.1}/plain/templates/jinja/globals.py

@@ -1,4 +1,3 @@
-from plain.assets.urls import get_asset_url
 from plain.paginator import Paginator
 from plain.utils import timezone
 
@@ -10,8 +9,16 @@ def url(viewname, *args, **kwargs):
     return reverse(viewname, args=args, kwargs=kwargs)
 
 
+def asset(url_path):
+    # An explicit callable we can control, but also delay the import of asset.urls->views->templates
+    # for circular import reasons
+    from plain.assets.urls import get_asset_url
+
+    return get_asset_url(url_path)
+
+
 default_globals = {
-    "asset": get_asset_url,
+    "asset": asset,
     "url": url,
     "Paginator": Paginator,
     "now": timezone.now,

{plain-0.2.5 → plain-0.3.1}/plain/test/client.py

@@ -2,7 +2,6 @@ import json
 import mimetypes
 import os
 import sys
-from copy import copy
 from functools import partial
 from http import HTTPStatus
 from http.cookies import SimpleCookie
@@ -196,19 +195,6 @@ class ClientHandler(BaseHandler):
         return response
 
 
-def store_rendered_templates(store, signal, sender, template, context, **kwargs):
-    """
-    Store templates and contexts that are rendered.
-
-    The context is copied so that it is an accurate representation at the time
-    of rendering.
-    """
-    store.setdefault("templates", []).append(template)
-    if "context" not in store:
-        store["context"] = ContextList()
-    store["context"].append(copy(context))
-
-
 def encode_multipart(boundary, data):
     """
     Encode multipart POST data from a dictionary of form values.
@@ -683,12 +669,6 @@ class Client(ClientMixin, RequestFactory):
         """
         environ = self._base_environ(**request)
 
-        # Curry a data dictionary into an instance of the template renderer
-        # callback function.
-        data = {}
-        partial(store_rendered_templates, data)
-        "template-render-%s" % id(request)
-        # signals.template_rendered.connect(on_template_render, dispatch_uid=signal_uid)
         # Capture exceptions created by the handler.
         exception_uid = "request-exception-%s" % id(request)
         got_request_exception.connect(self.store_exc_info, dispatch_uid=exception_uid)
@@ -702,20 +682,18 @@ class Client(ClientMixin, RequestFactory):
         # Save the client and request that stimulated the response.
         response.client = self
         response.request = request
-        # Add any rendered template detail to the response.
-        response.templates = data.get("templates", [])
-        response.context = data.get("context")
         response.json = partial(self._parse_json, response)
+
+        # If the request had a user attached, make it available on the response.
+        if hasattr(response.wsgi_request, "user"):
+            response.user = response.wsgi_request.user
+
         # Attach the ResolverMatch instance to the response.
         urlconf = getattr(response.wsgi_request, "urlconf", None)
         response.resolver_match = SimpleLazyObject(
             lambda: resolve(request["PATH_INFO"], urlconf=urlconf),
         )
-        # Flatten a single context. Not really necessary anymore thanks to the
-        # __getattr__ flattening in ContextList, but has some edge case
-        # backwards compatibility implications.
-        if response.context and len(response.context) == 1:
-            response.context = response.context[0]
+
         # Update persistent cookie data.
         if response.cookies:
             self.cookies.update(response.cookies)

{plain-0.2.5 → plain-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "plain"
-version = "0.2.5"
+version = "0.3.1"
 description = "A web framework for building products with Python."
 authors = ["Dave Gaeddert <dave.gaeddert@dropseed.dev>"]
 readme = "README.md"