plain 0.35.0__py3-none-any.whl → 0.36.0__py3-none-any.whl

plain/csrf/middleware.py

@@ -156,7 +156,7 @@ class RejectRequest(Exception):
 
 class CsrfViewMiddleware:
     """
-    Require a present and correct csrfmiddlewaretoken for POST requests that
+    Require a present and correct _csrftoken for POST requests that
     have a CSRF cookie, and set an outgoing CSRF cookie.
 
     This middleware should be used in conjunction with the {% csrf_token %}
@@ -364,7 +364,7 @@ class CsrfViewMiddleware:
         request_csrf_token = ""
         if request.method == "POST":
             try:
-                request_csrf_token = request.POST.get("csrfmiddlewaretoken", "")
+                request_csrf_token = request.POST.get(settings.CSRF_POST_NAME, "")
             except UnreadablePostError:
                 # Handle a broken connection before we've completed reading the
                 # POST data. process_view shouldn't raise any exceptions, so
@@ -380,7 +380,7 @@ class CsrfViewMiddleware:
                 # depending on whether the client obtained the token from
                 # the DOM or the cookie (and if the cookie, whether the cookie
                 # was masked or unmasked).
-                request_csrf_token = request.META[settings.CSRF_HEADER_NAME]
+                request_csrf_token = request.headers[settings.CSRF_HEADER_NAME]
             except KeyError:
                 raise RejectRequest(REASON_CSRF_TOKEN_MISSING)
             token_source = settings.CSRF_HEADER_NAME

plain/http/README.md

@@ -17,7 +17,7 @@ class ExampleView(View):
         print(self.request.GET.get("example"))
 
         # Creating a response
-        response = Response("Hello, world!", status=200)
+        response = Response("Hello, world!", status_code=200)
 
         # Setting a response header
         response.headers["Example-Header"] = "Example Value"

plain/http/response.py

@@ -108,7 +108,13 @@ class ResponseBase:
     status_code = 200
 
     def __init__(
-        self, content_type=None, status=None, reason=None, charset=None, headers=None
+        self,
+        *,
+        content_type=None,
+        status_code=None,
+        reason=None,
+        charset=None,
+        headers=None,
     ):
         self.headers = ResponseHeaders(headers)
         self._charset = charset
@@ -127,9 +133,9 @@ class ResponseBase:
         self._handler_class = None
         self.cookies = SimpleCookie()
         self.closed = False
-        if status is not None:
+        if status_code is not None:
             try:
-                self.status_code = int(status)
+                self.status_code = int(status_code)
             except (ValueError, TypeError):
                 raise TypeError("HTTP status code must be an integer.")
 
@@ -353,8 +359,8 @@ class Response(ResponseBase):
         ]
     )
 
-    def __init__(self, content=b"", *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, content=b"", **kwargs):
+        super().__init__(**kwargs)
         # Content is a bytestring. See the `content` property methods.
         self.content = content
 
@@ -434,8 +440,8 @@ class StreamingResponse(ResponseBase):
 
     streaming = True
 
-    def __init__(self, streaming_content=(), *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, streaming_content=(), **kwargs):
+        super().__init__(**kwargs)
         # `streaming_content` should be an iterable of bytestrings.
         # See the `streaming_content` property methods.
         self.streaming_content = streaming_content
@@ -560,8 +566,8 @@ class FileResponse(StreamingResponse):
 class ResponseRedirectBase(Response):
     allowed_schemes = ["http", "https", "ftp"]
 
-    def __init__(self, redirect_to, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, redirect_to, **kwargs):
+        super().__init__(**kwargs)
         self.headers["Location"] = iri_to_uri(redirect_to)
         parsed = urlparse(str(redirect_to))
         if parsed.scheme and parsed.scheme not in self.allowed_schemes:

plain/runtime/global_settings.py

@@ -133,7 +133,8 @@ CSRF_COOKIE_PATH = "/"
 CSRF_COOKIE_SECURE = True
 CSRF_COOKIE_HTTPONLY = False
 CSRF_COOKIE_SAMESITE = "Lax"
-CSRF_HEADER_NAME = "HTTP_X_CSRFTOKEN"
+CSRF_HEADER_NAME = "CSRF-Token"
+CSRF_POST_NAME = "_csrftoken"
 CSRF_TRUSTED_ORIGINS: list[str] = []
 
 ###########
@@ -169,3 +170,9 @@ PREFLIGHT_SILENCED_CHECKS = []
 #############
 
 TEMPLATES_JINJA_ENVIRONMENT = "plain.templates.jinja.DefaultEnvironment"
+
+#########
+# Shell #
+#########
+
+SHELL_IMPORT: str = ""

plain/views/README.md

@@ -214,7 +214,7 @@ class ExampleView(DetailView):
     def get_object(self):
         if self.request.user.exceeds_rate_limit:
             raise ResponseException(
-                Response("Rate limit exceeded", status=429)
+                Response("Rate limit exceeded", status_code=429)
             )
 
         return AnExpensiveObject()

plain/views/base.py

@@ -95,7 +95,7 @@ class View:
             return JsonResponse(result)
 
         if isinstance(result, int):
-            return Response(status=result)
+            return Response(status_code=result)
 
         # Allow tuple for (status_code, content)?
 

plain/views/objects.py

@@ -7,7 +7,7 @@ from .templates import TemplateView
 
 
 class ObjectTemplateViewMixin:
-    context_object_name = ""
+    context_object_name = "object"
 
     def get(self) -> Response:
         self.load_object()
@@ -31,39 +31,9 @@ class ObjectTemplateViewMixin:
     def get_template_context(self) -> dict:
         """Insert the single object into the context dict."""
         context = super().get_template_context()  # type: ignore
-        context["object"] = self.object
-        if self.context_object_name:
-            context[self.context_object_name] = self.object
-        elif hasattr(self.object, "_meta"):
-            context[self.object._meta.model_name] = self.object
+        context[self.context_object_name] = self.object
         return context
 
-    def get_template_names(self) -> list[str]:
-        """
-        Return a list of template names to be used for the request. May not be
-        called if render_to_response() is overridden. Return the following list:
-
-        * the value of ``template_name`` on the view (if provided)
-          object instance that the view is operating upon (if available)
-        * ``<package_label>/<model_name><template_name_suffix>.html``
-        """
-        if self.template_name:  # type: ignore
-            return [self.template_name]  # type: ignore
-
-        # If template_name isn't specified, it's not a problem --
-        # we just start with an empty list.
-        names = []
-
-        # The least-specific option is the default <app>/<model>_detail.html;
-        # only use this if the object in question is a model.
-        if hasattr(self.object, "_meta"):
-            object_meta = self.object._meta
-            names.append(
-                f"{object_meta.package_label}/{object_meta.model_name}{self.template_name_suffix}.html"
-            )
-
-        return names
-
 
 class DetailView(ObjectTemplateViewMixin, TemplateView):
     """
@@ -73,7 +43,7 @@ class DetailView(ObjectTemplateViewMixin, TemplateView):
     view will support display of *any* object by overriding `self.get_object()`.
     """
 
-    template_name_suffix = "_detail"
+    pass
 
 
 class CreateView(ObjectTemplateViewMixin, FormView):
@@ -81,8 +51,6 @@ class CreateView(ObjectTemplateViewMixin, FormView):
     View for creating a new object, with a response rendered by a template.
     """
 
-    template_name_suffix = "_form"
-
     def post(self) -> Response:
         """
         Handle POST requests: instantiate a form instance with the passed
@@ -119,8 +87,6 @@ class CreateView(ObjectTemplateViewMixin, FormView):
 class UpdateView(ObjectTemplateViewMixin, FormView):
     """View for updating an object, with a response rendered by a template."""
 
-    template_name_suffix = "_form"
-
     def post(self) -> Response:
         """
         Handle POST requests: instantiate a form instance with the passed
@@ -170,7 +136,6 @@ class DeleteView(ObjectTemplateViewMixin, FormView):
             self.instance.delete()
 
     form_class = EmptyDeleteForm
-    template_name_suffix = "_confirm_delete"
 
     def post(self) -> Response:
         """
@@ -198,7 +163,6 @@ class ListView(TemplateView):
     rendered by a template.
     """
 
-    template_name_suffix = "_list"
     context_object_name = "objects"
 
     def get(self) -> Response:
@@ -215,29 +179,3 @@ class ListView(TemplateView):
         context = super().get_template_context()  # type: ignore
         context[self.context_object_name] = self.objects
         return context
-
-    def get_template_names(self) -> list[str]:
-        """
-        Return a list of template names to be used for the request. May not be
-        called if render_to_response() is overridden. Return the following list:
-
-        * the value of ``template_name`` on the view (if provided)
-          object instance that the view is operating upon (if available)
-        * ``<package_label>/<model_name><template_name_suffix>.html``
-        """
-        if self.template_name:  # type: ignore
-            return [self.template_name]  # type: ignore
-
-        # If template_name isn't specified, it's not a problem --
-        # we just start with an empty list.
-        names = []
-
-        # The least-specific option is the default <app>/<model>_detail.html;
-        # only use this if the object in question is a model.
-        if hasattr(self.objects, "model") and hasattr(self.objects.model, "_meta"):
-            object_meta = self.objects.model._meta
-            names.append(
-                f"{object_meta.package_label}/{object_meta.model_name}{self.template_name_suffix}.html"
-            )
-
-        return names

plain/views/templates.py

@@ -11,7 +11,8 @@ from .base import View
 
 def csrf_input(request):
     return format_html(
-        '<input type="hidden" name="csrfmiddlewaretoken" value="{}">',
+        '<input type="hidden" name="{}" value="{}">',
+        settings.CSRF_POST_NAME,
         get_token(request),
     )
 
@@ -41,20 +42,21 @@ class TemplateView(View):
 
     def get_template_names(self) -> list[str]:
         """
-        Return a list of template names to be used for the request. Must return
-        a list. May not be called if render_to_response() is overridden.
+        Return a list of template names to be used for the request.
         """
-        if self.template_name is None:
-            raise ImproperlyConfigured(
-                "TemplateView requires either a definition of "
-                "'template_name' or an implementation of 'get_template_names()'"
-            )
-        else:
+        if self.template_name:
             return [self.template_name]
 
+        return []
+
     def get_template(self) -> Template:
         template_names = self.get_template_names()
 
+        if not template_names:
+            raise ImproperlyConfigured(
+                f"{self.__class__.__name__} requires a template_name or get_template_names()."
+            )
+
         for template_name in template_names:
             try:
                 return Template(template_name)

{plain-0.35.0.dist-info → plain-0.36.0.dist-info}/METADATA

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

{plain-0.35.0.dist-info → plain-0.36.0.dist-info}/RECORD

@@ -13,16 +13,24 @@ plain/assets/compile.py,sha256=rABDHj7k_YAIPVvS7JJLCukEgUhb7h5oz9ajt5fGirI,3298
 plain/assets/finders.py,sha256=2k8QZAbfUbc1LykxbzdazTSB6xNxJZnsZaGhWbSFZZs,1452
 plain/assets/fingerprints.py,sha256=2LPHLUkoITMseLDmemTpBtMRDWCR2H5GAHjC6AN4gz0,1367
 plain/assets/urls.py,sha256=zQUA8bAlh9qVqskPJJrqWd9DjvetOi5jPSqy4vUX0J4,1161
-plain/assets/views.py,sha256=XEaw155u4F3tZRcBHebWJJsGd-m_5sw0nRABc8mnjlg,9432
+plain/assets/views.py,sha256=T_0Qh6v9qBerEBYbhToigwOzsij-x1z_R-1zETQcIh0,9447
 plain/cli/README.md,sha256=ompPcgzY2Fdpm579ITmCpFIaZIsiXYbfD61mqkq312M,1860
 plain/cli/__init__.py,sha256=6w9T7K2WrPwh6DcaMb2oNt_CWU6Bc57nUTO2Bt1p38Y,63
-plain/cli/core.py,sha256=KL7f5NDC-gvu9nG-1tA_ufiP1k13HD44bD9lekAdK5E,25691
+plain/cli/build.py,sha256=dKUYBNegvb6QNckR7XZ7CJJtINwZcmDvbUdv2dWwjf8,3226
+plain/cli/core.py,sha256=N7xUO8Ox2xz8wJyWZ0fSyCfqVFmKz9czH9gulRyQuM4,2809
+plain/cli/docs.py,sha256=dHInHcweVLOew3hCNspVvUQ8epEfovDh3yI6O_FEsnI,7546
 plain/cli/formatting.py,sha256=1hZH13y1qwHcU2K2_Na388nw9uvoeQH8LrWL-O9h8Yc,2207
+plain/cli/preflight.py,sha256=NKyYjcoDjigzfJIDhf7A7degYadaUI05Bw7U9OQ73vs,4170
 plain/cli/print.py,sha256=XraUYrgODOJquIiEv78wSCYGRBplHXtXSS9QtFG5hqY,217
 plain/cli/registry.py,sha256=yKVMSDjW8g10nlV9sPXFGJQmhC_U-k4J4kM7N2OQVLA,1467
-plain/cli/startup.py,sha256=3LIz9JrIZoF52Sa0j0SCypQwEaBDkhvuGaBdtiQLr5Q,680
-plain/csrf/README.md,sha256=nYbUcR9p7VNxB-8z00OluB1C0EJ0WRKJIhqX6RkjiiU,708
-plain/csrf/middleware.py,sha256=FYhT7KPJ664Sm0nKjeej1OIXalvVTYiotQX3ytI0dfY,17417
+plain/cli/scaffold.py,sha256=EEyiexgp9jqmIet3Wndh405xErV0lT1jQevqhGkbudw,1326
+plain/cli/settings.py,sha256=9cx4bue664I2P7kUedlf4YhCPB0tSKSE4Q8mGyzEv2o,1995
+plain/cli/shell.py,sha256=iIwvlTdTBjLBBUdXMAmIRWSoynszOZI79-mrBg4RegU,1373
+plain/cli/startup.py,sha256=wLaFuyUb4ewWhtehBCGicrRCXIIGCRbeCT3ce9hUv-A,1022
+plain/cli/urls.py,sha256=CS9NFpwZBWveAR8F3YsoUNySDEK_PwF73oSgLDfkOdI,3776
+plain/cli/utils.py,sha256=VwlIh0z7XxzVV8I3qM2kZo07fkJFPoeeVZa1ODG616k,258
+plain/csrf/README.md,sha256=Xqb3pRZcIF6TJlOzEksQN0zue4mY7OTebNta9cq0T8g,699
+plain/csrf/middleware.py,sha256=bn8KOE45aucSam0m3F9g8FVfnmjjt-6jxS6iSNwHamU,17413
 plain/csrf/views.py,sha256=HwQqfI6KPelHP9gSXhjfZaTLQic71PKsoZ6DPhr1rKI,572
 plain/forms/README.md,sha256=TawBdy1jP0-8HUsfUzd7vvgkwl3EJGejDxFhWR8F-80,2242
 plain/forms/__init__.py,sha256=UxqPwB8CiYPCQdHmUc59jadqaXqDmXBH8y4bt9vTPms,226
@@ -30,12 +38,12 @@ plain/forms/boundfield.py,sha256=LhydhCVR0okrli0-QBMjGjAJ8-06gTCXVEaBZhBouQk,174
 plain/forms/exceptions.py,sha256=XCLDRl5snIEDu5-8mLB0NnU_tegcBfyIHMiJxqvbxnc,164
 plain/forms/fields.py,sha256=Fw77LP06aO5h6ZdJmS2S_2On4YSrsl4gu142Y6nGF50,34987
 plain/forms/forms.py,sha256=fEKBee1b8I_DJ-FufzWJGtSQoUoyieYfqUaGEre9B4Q,10418
-plain/http/README.md,sha256=yoIx-igIU0rYBZuyKWkXph4Zvhei04ZYz6RhQuMe1kA,708
+plain/http/README.md,sha256=G662f56feQWiEHw9tTncZqK8kNB_nbR1HTGeOR1ygNM,713
 plain/http/__init__.py,sha256=DIsDRbBsCGa4qZgq-fUuQS0kkxfbTU_3KpIM9VvH04w,1067
 plain/http/cookie.py,sha256=11FnSG3Plo6T3jZDbPoCw7SKh9ExdBio3pTmIO03URg,597
 plain/http/multipartparser.py,sha256=Cyk_UZhxf8JwNza_Yl4_nKCYkmnG7xY9PSVcf9Us57U,27266
 plain/http/request.py,sha256=kq3AuM0EWyAD_kqMlorTccm5mzIQ6ZefkCa-jXUntnI,25514
-plain/http/response.py,sha256=RR2sUG-ONWKWcZyIbztjWvtFyh0cR-CoxQvnWOyN0io,23619
+plain/http/response.py,sha256=IGSg22ioob6kSRkKGQsQF_exb2Lch8RKiZr_Xoi1_xA,23644
 plain/internal/__init__.py,sha256=fVBaYLCXEQc-7riHMSlw3vMTTuF7-0Bj2I8aGzv0o0w,171
 plain/internal/files/__init__.py,sha256=VctFgox4Q1AWF3klPaoCC5GIw5KeLafYjY5JmN8mAVw,63
 plain/internal/files/base.py,sha256=-JpRMzv2bgVSZ9dcxh13gGRTVeEd_Tjd02iQMOXsRgQ,4126
@@ -71,7 +79,7 @@ plain/preflight/security.py,sha256=oxUZBp2M0bpBfUoLYepIxoex2Y90nyjlrL8XU8UTHYY,2
 plain/preflight/urls.py,sha256=cQ-WnFa_5oztpKdtwhuIGb7pXEml__bHsjs1SWO2YNI,1468
 plain/runtime/README.md,sha256=S_FIOmSq8LkVQHh9Xm6s3EJWKTVdlSr5A_bNXgh02X8,4740
 plain/runtime/__init__.py,sha256=o2RVETiL8U0lMFBpbtfnxflhw_4MFllMV6CEpX3RqZs,1965
-plain/runtime/global_settings.py,sha256=4YpUJ9wN8t3UteekTpYTvZaO4Dkv4EVjvIlkgISKGbw,5500
+plain/runtime/global_settings.py,sha256=gg9XhMJmzbQqfxzst5JaI0hDIzPvTwX5M0AonJk2ISY,5579
 plain/runtime/user_settings.py,sha256=uRHHVfzUvHon91_fOKj7K2WaBYwJ1gCPLfeXqKj5CTs,10902
 plain/signals/README.md,sha256=FInfJXdVQkb7u93PvD8XgPbz_f6m0l2xIu_4PyttV1E,234
 plain/signals/__init__.py,sha256=eAs0kLqptuP6I31dWXeAqRNji3svplpAV4Ez6ktjwXM,131
@@ -124,18 +132,18 @@ plain/utils/text.py,sha256=42hJv06sadbWfsaAHNhqCQaP1W9qZ69trWDTS-Xva7k,9496
 plain/utils/timesince.py,sha256=a_-ZoPK_s3Pt998CW4rWp0clZ1XyK2x04hCqak2giII,5928
 plain/utils/timezone.py,sha256=6u0sE-9RVp0_OCe0Y1KiYYQoq5THWLokZFQYY8jf78g,6221
 plain/utils/tree.py,sha256=wdWzmfsgc26YDF2wxhAY3yVxXTixQYqYDKE9mL3L3ZY,4383
-plain/views/README.md,sha256=JyqAWMXYdaVnRncmb12yvlBhC629zRtWR7uzkKFwc9Y,5998
+plain/views/README.md,sha256=mveTtHrd2z3knSAchW2jTwfg59_bowwhAacx-3QBBHw,6003
 plain/views/__init__.py,sha256=a-N1nkklVohJTtz0yD1MMaS0g66HviEjsKydNVVjvVc,392
-plain/views/base.py,sha256=E6TjfCJYbf7Jh2P-Zd2YsLJbC99Gj9bN21Y_CMqQAao,3275
+plain/views/base.py,sha256=LomceHi01okLk41YfUr6cBE0VB5FNsSVODTOQ-Rmv0I,3280
 plain/views/csrf.py,sha256=7q6l5xzLWhRnMY64aNj0hR6G-3pxI2yhRwG6k_5j00E,144
 plain/views/errors.py,sha256=jbNCJIzowwCsEvqyJ3opMeZpPDqTyhtrbqb0VnAm2HE,1263
 plain/views/exceptions.py,sha256=b4euI49ZUKS9O8AGAcFfiDpstzkRAuuj_uYQXzWNHME,138
 plain/views/forms.py,sha256=5L6dYkwcZFMD3-w_QC2QDElo9hhSPrhVVFq9CB5yL9k,2692
-plain/views/objects.py,sha256=g5Lzno0Zsv0K449UpcCtxwCoO7WMRAWqKlxxV2V0_qg,8263
+plain/views/objects.py,sha256=giLe9-XespeKwyEd289hfApO_9Mjwz0oddB1_2-8ko8,5713
 plain/views/redirect.py,sha256=vMXx8430FtyKcT0V0gyY92SkLtyULBX52KhX4eu4gEA,1985
-plain/views/templates.py,sha256=gwPqRki3SVcaTmtSCEp1MycUB-1saDYeYzmZZTQLxjE,2117
-plain-0.35.0.dist-info/METADATA,sha256=GAMRCUdN1HOOzB3UOXvHSKZ2q04mhjmFZK2eJJYLdWM,3944
-plain-0.35.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain-0.35.0.dist-info/entry_points.txt,sha256=1Ys2lsSeMepD1vz8RSrJopna0RQfUd951vYvCRsvl6A,45
-plain-0.35.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
-plain-0.35.0.dist-info/RECORD,,
+plain/views/templates.py,sha256=kMcHKkKNvucF91SFGkaq-ugjrCwn4zJBpFV1JkwA544,2027
+plain-0.36.0.dist-info/METADATA,sha256=8WWGgPUMTMgzmwIpFovdG2nz8t-0GfokN_tdHxtFHnY,3944
+plain-0.36.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain-0.36.0.dist-info/entry_points.txt,sha256=1Ys2lsSeMepD1vz8RSrJopna0RQfUd951vYvCRsvl6A,45
+plain-0.36.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
+plain-0.36.0.dist-info/RECORD,,