plain 0.2.5__py3-none-any.whl → 0.3.1__py3-none-any.whl

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/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.dist-info → plain-0.3.1.dist-info}/METADATA

@@ -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.dist-info → plain-0.3.1.dist-info}/RECORD

@@ -98,10 +98,10 @@ plain/templates/jinja/__init__.py,sha256=1VAyXRHf2hDPniZfnKhiMWsOp4Gkg0Ss1xmAbuv
 plain/templates/jinja/defaults.py,sha256=AhGxp8X4UNC6CRD0XygQDV3ZeIs4KH2NaCjPtlgFeL0,3770
 plain/templates/jinja/extensions.py,sha256=AEmmmHDbdRW8fhjYDzq9eSSNbp9WHsXenD8tPthjc0s,1351
 plain/templates/jinja/filters.py,sha256=3KJKKbxcv9dLzUDWPcaa88k3NU2m1GG3iMIgFhzXrBA,860
-plain/templates/jinja/globals.py,sha256=MRhkTVVH2iKWc_GPX5E2uoafBV-tDVxyY58d_S4Zgwo,479
+plain/templates/jinja/globals.py,sha256=qhvQuikkRkOTpHSW5FwdsvoViJNlRgHq3-O7ZyeajsE,669
 plain/test/README.md,sha256=Zso3Ir7a8vQerzKB6egjROQWkpveLAbscn7VTROPAiU,37
 plain/test/__init__.py,sha256=rXe88Y602NP8DBnReSyXb7dUzKoWweLuT43j-qwOUl4,138
-plain/test/client.py,sha256=w8QxRE04ozCyF5TZRxrtg-R9ECiZ0VV105t9Ty89cXg,32412
+plain/test/client.py,sha256=cu43S-NL606VERUYi7NjvzIrVchlNLHqcKro7pnYmS4,31385
 plain/urls/README.md,sha256=pWnCvgYkWN7rG7hSyBOtX4ZUP3iO7FhqM6lvwwYll6c,33
 plain/urls/__init__.py,sha256=3UzwIufXjIks2K_X_Vms2MV19IqvyPLrXUeHU3WP47c,753
 plain/urls/base.py,sha256=ECaOCEXs1ygKn4k1mt5XxSNPNlg5raJvx0aPaj7DFfE,3719
@@ -152,8 +152,8 @@ plain/views/objects.py,sha256=9QBYyb8PgkRirXCQ8-Pms4_yMzP37dfeL30hWRYmtZg,7909
 plain/views/redirect.py,sha256=KLnlktzK6ZNMTlaEiZpMKQMEP5zeTgGLJ9BIkIJfwBo,1733
 plain/views/templates.py,sha256=nF9CcdhhjAyp3LB0RrSYnBaHpHzMfPSw719RCdcXk7o,2007
 plain/wsgi.py,sha256=R6k5FiAElvGDApEbMPTT0MPqSD7n2e2Az5chQqJZU0I,236
-plain-0.2.5.dist-info/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
-plain-0.2.5.dist-info/METADATA,sha256=KyaK66wyLHe9OHXObllwbTbUPmyk6jNqTGRo-yOJkkI,2716
-plain-0.2.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-plain-0.2.5.dist-info/entry_points.txt,sha256=7O1RZTmMasKYB73bfqQcTwIhsXo7RjEIKv2WbtTtOIM,39
-plain-0.2.5.dist-info/RECORD,,
+plain-0.3.1.dist-info/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
+plain-0.3.1.dist-info/METADATA,sha256=jqe-VkpbsAVz8oO9xeOuDmZPkvszIdUfXzgTyxr0yJU,2716
+plain-0.3.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+plain-0.3.1.dist-info/entry_points.txt,sha256=7O1RZTmMasKYB73bfqQcTwIhsXo7RjEIKv2WbtTtOIM,39
+plain-0.3.1.dist-info/RECORD,,