plain 0.43.1__py3-none-any.whl → 0.44.0__py3-none-any.whl

plain/README.md

@@ -31,7 +31,7 @@ The `plain` package includes everything you need to start handling web requests
 - [plain.cache](/plain-cache/plain/cache/README.md) - A database-driven general purpose cache.
 - [plain.email](/plain-email/plain/email/README.md) - Send emails with SMTP or custom backends.
 - [plain.sessions](/plain-sessions/plain/sessions/README.md) - User sessions and cookies.
-- [plain.worker](/plain-worker/plain/worker/README.md) - Backgrounb jobs stored in the database.
+- [plain.worker](/plain-worker/plain/worker/README.md) - Background jobs stored in the database.
 - [plain.api](/plain-api/plain/api/README.md) - Build APIs with Plain views.
 
 ## Auth Packages

plain/csrf/middleware.py

@@ -8,6 +8,7 @@ against request forgeries from other sites.
 import logging
 import string
 from collections import defaultdict
+from functools import cached_property
 from urllib.parse import urlparse
 
 from plain.exceptions import DisallowedHost
@@ -16,7 +17,6 @@ from plain.logs import log_response
 from plain.runtime import settings
 from plain.utils.cache import patch_vary_headers
 from plain.utils.crypto import constant_time_compare, get_random_string
-from plain.utils.functional import cached_property
 from plain.utils.http import is_same_domain
 from plain.utils.regex_helper import _lazy_re_compile
 

plain/forms/forms.py

@@ -3,9 +3,9 @@ Form classes
 """
 
 import copy
+from functools import cached_property
 
 from plain.exceptions import NON_FIELD_ERRORS
-from plain.utils.functional import cached_property
 
 from .exceptions import ValidationError
 from .fields import Field, FileField

plain/http/request.py

@@ -2,6 +2,7 @@ import codecs
 import copy
 import json
 import uuid
+from functools import cached_property
 from io import BytesIO
 from itertools import chain
 from urllib.parse import parse_qsl, quote, urlencode, urljoin, urlsplit
@@ -25,7 +26,6 @@ from plain.utils.datastructures import (
     MultiValueDict,
 )
 from plain.utils.encoding import iri_to_uri
-from plain.utils.functional import cached_property
 from plain.utils.http import is_same_domain, parse_header_parameters
 from plain.utils.regex_helper import _lazy_re_compile
 

plain/http/response.py

@@ -18,7 +18,7 @@ from plain.json import PlainJSONEncoder
 from plain.runtime import settings
 from plain.utils import timezone
 from plain.utils.datastructures import CaseInsensitiveMapping
-from plain.utils.encoding import iri_to_uri
+from plain.utils.encoding import force_bytes, iri_to_uri
 from plain.utils.http import content_disposition_header, http_date
 from plain.utils.regex_helper import _lazy_re_compile
 
@@ -258,7 +258,17 @@ class ResponseBase:
             self.cookies[key]["samesite"] = samesite
 
     def set_signed_cookie(self, key, value, salt="", **kwargs):
-        value = signing.get_cookie_signer(salt=key + salt).sign(value)
+        """Set a cookie signed with the SECRET_KEY."""
+
+        def _cookie_key(k):
+            return b"plain.http.cookies" + force_bytes(k)
+
+        signer = signing.TimestampSigner(
+            key=_cookie_key(settings.SECRET_KEY),
+            fallback_keys=map(_cookie_key, settings.SECRET_KEY_FALLBACKS),
+            salt=key + salt,
+        )
+        value = signer.sign(value)
         return self.set_cookie(key, value, **kwargs)
 
     def delete_cookie(self, key, path="/", domain=None, samesite=None):

plain/internal/files/base.py

@@ -1,8 +1,8 @@
 import os
+from functools import cached_property
 from io import UnsupportedOperation
 
 from plain.internal.files.utils import FileProxyMixin
-from plain.utils.functional import cached_property
 
 
 class File(FileProxyMixin):

plain/internal/handlers/wsgi.py

@@ -1,11 +1,11 @@
 import uuid
+from functools import cached_property
 from io import IOBase
 from urllib.parse import quote
 
 from plain import signals
 from plain.http import HttpRequest, QueryDict, parse_cookie
 from plain.internal.handlers import base
-from plain.utils.functional import cached_property
 from plain.utils.regex_helper import _lazy_re_compile
 
 _slashes_re = _lazy_re_compile(rb"/+")
@@ -125,15 +125,13 @@ class WSGIRequest(HttpRequest):
 
 
 class WSGIHandler(base.BaseHandler):
-    request_class = WSGIRequest
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.load_middleware()
 
     def __call__(self, environ, start_response):
         signals.request_started.send(sender=self.__class__, environ=environ)
-        request = self.request_class(environ)
+        request = WSGIRequest(environ)
         response = self.get_response(request)
 
         response._handler_class = self.__class__

plain/paginator.py

@@ -1,9 +1,9 @@
 import collections.abc
 import inspect
 import warnings
+from functools import cached_property
 from math import ceil
 
-from plain.utils.functional import cached_property
 from plain.utils.inspect import method_has_no_args
 
 

plain/runtime/global_settings.py

@@ -109,12 +109,6 @@ HTTP_ERROR_VIEWS: dict[int] = {}
 # phase the middleware will be applied in reverse order.
 MIDDLEWARE: list[str] = []
 
-###########
-# SIGNING #
-###########
-
-COOKIE_SIGNING_BACKEND = "plain.signing.TimestampSigner"
-
 ########
 # CSRF #
 ########

plain/runtime/user_settings.py

@@ -121,7 +121,9 @@ class Settings:
             if setting in self._settings:
                 setting_def = self._settings[setting]
                 try:
-                    parsed_value = _parse_env_value(value, setting_def.annotation)
+                    parsed_value = _parse_env_value(
+                        value, setting_def.annotation, setting
+                    )
                     setting_def.set_value(parsed_value, "env")
                 except ImproperlyConfigured as e:
                     self._errors.append(str(e))
@@ -211,9 +213,11 @@ class Settings:
         return f'<Settings "{self._settings_module}">'
 
 
-def _parse_env_value(value, annotation):
+def _parse_env_value(value, annotation, setting_name):
     if not annotation:
-        raise ImproperlyConfigured("Type hint required to set from environment.")
+        raise ImproperlyConfigured(
+            f"{setting_name}: Type hint required to set from environment."
+        )
 
     if annotation is bool:
         # Special case for bools
@@ -226,7 +230,7 @@ def _parse_env_value(value, annotation):
             return json.loads(value)
         except json.JSONDecodeError as e:
             raise ImproperlyConfigured(
-                f"Invalid JSON value for setting: {e.msg}"
+                f"Invalid JSON value for setting '{setting_name}': {e.msg}"
             ) from e
 
 

plain/signing.py

@@ -41,8 +41,6 @@ import zlib
 
 from plain.runtime import settings
 from plain.utils.crypto import constant_time_compare, salted_hmac
-from plain.utils.encoding import force_bytes
-from plain.utils.module_loading import import_string
 from plain.utils.regex_helper import _lazy_re_compile
 
 _SEP_UNSAFE = _lazy_re_compile(r"^[A-z0-9-_=]*$")
@@ -101,20 +99,6 @@ def base64_hmac(salt, value, key, algorithm="sha1"):
     ).decode()
 
 
-def _cookie_signer_key(key):
-    # SECRET_KEYS items may be str or bytes.
-    return b"plain.http.cookies" + force_bytes(key)
-
-
-def get_cookie_signer(salt="plain.signing.get_cookie_signer"):
-    Signer = import_string(settings.COOKIE_SIGNING_BACKEND)
-    return Signer(
-        key=_cookie_signer_key(settings.SECRET_KEY),
-        fallback_keys=map(_cookie_signer_key, settings.SECRET_KEY_FALLBACKS),
-        salt=salt,
-    )
-
-
 class JSONSerializer:
     """
     Simple wrapper around json to be used in signing.dumps and

plain/utils/connection.py

@@ -1,7 +1,7 @@
+from functools import cached_property
 from threading import local
 
 from plain.runtime import settings as plain_settings
-from plain.utils.functional import cached_property
 
 
 class ConnectionProxy:

plain/utils/functional.py

@@ -4,49 +4,6 @@ import operator
 from functools import total_ordering, wraps
 
 
-class cached_property:
-    """
-    Decorator that converts a method with a single self argument into a
-    property cached on the instance.
-
-    A cached property can be made out of an existing method:
-    (e.g. ``url = cached_property(get_absolute_url)``).
-    """
-
-    name = None
-
-    @staticmethod
-    def func(instance):
-        raise TypeError(
-            "Cannot use cached_property instance without calling __set_name__() on it."
-        )
-
-    def __init__(self, func):
-        self.real_func = func
-        self.__doc__ = getattr(func, "__doc__")
-
-    def __set_name__(self, owner, name):
-        if self.name is None:
-            self.name = name
-            self.func = self.real_func
-        elif name != self.name:
-            raise TypeError(
-                "Cannot assign the same cached_property to two different names "
-                f"({self.name!r} and {name!r})."
-            )
-
-    def __get__(self, instance, cls=None):
-        """
-        Call the function and put the return value in instance.__dict__ so that
-        subsequent attribute access on the instance returns the cached value
-        instead of calling cached_property.__get__().
-        """
-        if instance is None:
-            return self
-        res = instance.__dict__[self.name] = self.func(instance)
-        return res
-
-
 class classproperty:
     """
     Decorator that converts a method with a single cls argument into a property

{plain-0.43.1.dist-info → plain-0.44.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain
-Version: 0.43.1
+Version: 0.44.0
 Summary: A web framework for building products with Python.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-File: LICENSE
@@ -42,7 +42,7 @@ The `plain` package includes everything you need to start handling web requests
 - [plain.cache](/plain-cache/plain/cache/README.md) - A database-driven general purpose cache.
 - [plain.email](/plain-email/plain/email/README.md) - Send emails with SMTP or custom backends.
 - [plain.sessions](/plain-sessions/plain/sessions/README.md) - User sessions and cookies.
-- [plain.worker](/plain-worker/plain/worker/README.md) - Backgrounb jobs stored in the database.
+- [plain.worker](/plain-worker/plain/worker/README.md) - Background jobs stored in the database.
 - [plain.api](/plain-api/plain/api/README.md) - Build APIs with Plain views.
 
 ## Auth Packages

{plain-0.43.1.dist-info → plain-0.44.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-plain/README.md,sha256=TV_cAASLTSFjlmW7LD8J8Md1iKSjZpuZdEQGBCEXGUE,3986
+plain/README.md,sha256=gik6DBZcJAITcm4WRq_L53AxkjY45eQLafyTCSf0CKE,3986
 plain/__main__.py,sha256=GK39854Lc_LO_JP8DzY9Y2MIQ4cQEl7SXFJy244-lC8,110
 plain/debug.py,sha256=abPkJY4aSbBYGEYSZST_ZY3ohXPGDdz9uWQBYRqfd3M,730
 plain/exceptions.py,sha256=Z9cbPE5im_Y-bjVq8cqC85gBoqOr80rLFG5wTKixrwE,5894
 plain/json.py,sha256=McJdsbMT1sYwkGRG--f2NSZz0hVXPMix9x3nKaaak2o,1262
-plain/paginator.py,sha256=-fpLJd6c-V8bLCaNCHfTqPtm-Lm2Y1TuKqFDfy7n3ZE,5857
-plain/signing.py,sha256=sf7g1Mp-FzdjFAEoLxHyu2YvbUl5w4FOtTVDAfq6TO0,8733
+plain/paginator.py,sha256=iXiOyt2r_YwNrkqCRlaU7V-M_BKaaQ8XZElUBVa6yeU,5844
+plain/signing.py,sha256=r2KvCOxkrSWCULFxYa9BHYx3L3a2oLq8RDnq_92inTw,8207
 plain/validators.py,sha256=TePzFHzwR4JXUAZ_Y2vC6mkKgVxHX3QBXI6Oex0rV8c,19236
 plain/wsgi.py,sha256=R6k5FiAElvGDApEbMPTT0MPqSD7n2e2Az5chQqJZU0I,236
 plain/assets/README.md,sha256=wgsmBK5vAHgFMZ010q7LTrgLq5BTfuPuuug5HLZ9GNw,3774
@@ -34,23 +34,23 @@ 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=nxCpPk1HF5eAM-7paxg9D-9RVCU9jXsSPAVHkJvA_DU,717
-plain/csrf/middleware.py,sha256=MJusxqfa_SVpzHchfkTOCzccCl8twT8Cr_ymxLb5EvY,17414
+plain/csrf/middleware.py,sha256=U3B9R7ciO_UAf7O3jdNtVu6QZ_3Yrm8isRdnW6bVKX4,17401
 plain/csrf/views.py,sha256=HwQqfI6KPelHP9gSXhjfZaTLQic71PKsoZ6DPhr1rKI,572
 plain/forms/README.md,sha256=TawBdy1jP0-8HUsfUzd7vvgkwl3EJGejDxFhWR8F-80,2242
 plain/forms/__init__.py,sha256=UxqPwB8CiYPCQdHmUc59jadqaXqDmXBH8y4bt9vTPms,226
 plain/forms/boundfield.py,sha256=LhydhCVR0okrli0-QBMjGjAJ8-06gTCXVEaBZhBouQk,1741
 plain/forms/exceptions.py,sha256=NYk1wjYDkk-lA_XMJQDItOebQcL_m_r2eNRc2mkLQkg,315
 plain/forms/fields.py,sha256=C71ed7m8VBnsgS-eIC6Xsmz7ruNSkdGa1BuSo7V3QKc,34574
-plain/forms/forms.py,sha256=gyDUrl7wh7n3fqKMB6eH0-AvCmWXST3oc-jBWUf9rmU,10454
+plain/forms/forms.py,sha256=hF7Dl8rEaiBTZhFQyfbh1Zf54BSEka8RYpBiGqkTa8I,10441
 plain/http/README.md,sha256=F9wbahgSU3jIDEG14gJjdPJRem4weUNvwnwhb7o3cu0,722
 plain/http/__init__.py,sha256=DIsDRbBsCGa4qZgq-fUuQS0kkxfbTU_3KpIM9VvH04w,1067
 plain/http/cookie.py,sha256=11FnSG3Plo6T3jZDbPoCw7SKh9ExdBio3pTmIO03URg,597
 plain/http/multipartparser.py,sha256=Z1dFJNAd8N5RHUuF67jh1jBfZOFepORsre_3ee6CgOQ,27266
-plain/http/request.py,sha256=Xlolhpp2ZfZIi0TOz960U16CdqGi8jMhmHsBtxpkR_4,25631
-plain/http/response.py,sha256=IGSg22ioob6kSRkKGQsQF_exb2Lch8RKiZr_Xoi1_xA,23644
+plain/http/request.py,sha256=DbnC_E-PeiLM9pVJdcO869BtAU2gniLflMnPAOrrKU8,25618
+plain/http/response.py,sha256=WvVxQgQMq9X8YRBa9_neowfP3mx3TzN90SShSulfFQo,23970
 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
+plain/internal/files/base.py,sha256=2z19tik2_xgXlI6nfVZ4woSF9WB0RSUzsvOfi1Bz8Wg,4113
 plain/internal/files/locks.py,sha256=z03q7IZD4tPMK3s1HKF3w_uetkFj6w6FTheLUxZsfB0,3616
 plain/internal/files/move.py,sha256=jfdD29QhamxZjXRgqmZS4dJoJ4sK6M7QK1Km-69jWeo,3238
 plain/internal/files/temp.py,sha256=UJJnCI8dqPIC8XXHU3-jG2-0svbkrgGlBs4yhciLm4c,2506
@@ -60,7 +60,7 @@ plain/internal/files/utils.py,sha256=xN4HTJXDRdcoNyrL1dFd528MBwodRlHZM8DGTD_oBIg
 plain/internal/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plain/internal/handlers/base.py,sha256=6K8wd5DojOYA-UEQTd1jxdDggm5ThHXQahVcuJqd2qo,4169
 plain/internal/handlers/exception.py,sha256=vfha_6-fz6S6VYCP1PMBfue2Gw-_th6jqaTE372fGlw,4809
-plain/internal/handlers/wsgi.py,sha256=sOgqnE4fNzKD2a5EMubiEpHEK9Mi69FWx3BVWxGgMw0,8262
+plain/internal/handlers/wsgi.py,sha256=dgPT29t_F9llB-c5RYU3SHxGuZNaZ83xRjOfuOmtOl8,8209
 plain/internal/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plain/internal/middleware/headers.py,sha256=ENIW1Gwat54hv-ejgp2R8QTZm-PlaI7k44WU01YQrNk,964
 plain/internal/middleware/https.py,sha256=XpuQK8HicYX1jNanQHqNgyQ9rqe4NLUOZO3ZzKdsP8k,1203
@@ -83,8 +83,8 @@ 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=0Q7k0V-8OfmTaKC0paNvV4Lx92L1_J7xoEWQH9aO5y4,2005
-plain/runtime/global_settings.py,sha256=bg7vnEDGU4mdMKFF7QnnhCFawAUjqqXiocryaOr6gsU,5438
-plain/runtime/user_settings.py,sha256=uRHHVfzUvHon91_fOKj7K2WaBYwJ1gCPLfeXqKj5CTs,10902
+plain/runtime/global_settings.py,sha256=MpJ6vtBMO2EYALaKXrtgcGoxLh9Y549zwwErC5D5K7I,5343
+plain/runtime/user_settings.py,sha256=OzMiEkE6ZQ50nxd1WIqirXPiNuMAQULklYHEzgzLWgA,11027
 plain/signals/README.md,sha256=FInfJXdVQkb7u93PvD8XgPbz_f6m0l2xIu_4PyttV1E,234
 plain/signals/__init__.py,sha256=eAs0kLqptuP6I31dWXeAqRNji3svplpAV4Ez6ktjwXM,131
 plain/signals/dispatch/__init__.py,sha256=FzEygqV9HsM6gopio7O2Oh_X230nA4d5Q9s0sUjMq0E,292
@@ -114,7 +114,7 @@ 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
-plain/utils/connection.py,sha256=NN7xRhy6qIWuOOhi1x9YdGcFcYhKepTiMUETeEMS0vY,2501
+plain/utils/connection.py,sha256=KF57CXt4tVO0EXMRwvIQX0eSruvpNQwGkK4_YGT9nXo,2488
 plain/utils/crypto.py,sha256=zFDydnaqNMGYFHUc-CAn8f93685a17BhGusAcITH1lI,2662
 plain/utils/datastructures.py,sha256=g4UYTbxIb_n8F9JWMP4dHPwUz71591fHreGATPO4qEc,10240
 plain/utils/dateparse.py,sha256=u9_tF85YteXSjW9KQzNg_pcCEFDZS3EGorCddcWU0vE,5351
@@ -122,7 +122,7 @@ plain/utils/deconstruct.py,sha256=7NwEFIDCiadAArUBFmiErzDgfIgDWeKqqQFDXwSgQoQ,18
 plain/utils/decorators.py,sha256=mLHOo2jLdvYRo2z8lkeVn2vQErlj7xC6XoLwZBYf_z8,358
 plain/utils/duration.py,sha256=l0Gc41-DeyyAmpdy2XG-YO5UKxMf1NDpWIlQuD5hAn0,1162
 plain/utils/encoding.py,sha256=T0Shb2xRAR3NPwwoqhpUOB55gDprWzqu72aRiiulv9Y,4251
-plain/utils/functional.py,sha256=9sfuPSX1RalDkLNLjR7k-OjooHXjHSWB9ya2kDLOWtE,14652
+plain/utils/functional.py,sha256=eJksrhVdkC8HKF56qtVyTOsOnkZB2jMUnXSTGzjJMF4,13331
 plain/utils/hashable.py,sha256=uLWobCCh7VcEPJ7xzVGPgigNVuTazYJbyzRzHTCI_wo,739
 plain/utils/html.py,sha256=SR8oNrungB5gxJaHbvAaCw_bAiqLQOk09fj-iIXY0i0,3679
 plain/utils/http.py,sha256=VOOnwRXnDp5PL_qEmkInLTm10fF58vlhVjeSTdzV2cQ,6031
@@ -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.43.1.dist-info/METADATA,sha256=6uNFnTLaGGNquLaCjlvqN7vDZThC-YouL3ItOCxaIxE,4297
-plain-0.43.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain-0.43.1.dist-info/entry_points.txt,sha256=1Ys2lsSeMepD1vz8RSrJopna0RQfUd951vYvCRsvl6A,45
-plain-0.43.1.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
-plain-0.43.1.dist-info/RECORD,,
+plain-0.44.0.dist-info/METADATA,sha256=U2-CD6dtM5QQobziqQQmvdLz2EN1XhxghI587wYQSq0,4297
+plain-0.44.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain-0.44.0.dist-info/entry_points.txt,sha256=1Ys2lsSeMepD1vz8RSrJopna0RQfUd951vYvCRsvl6A,45
+plain-0.44.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
+plain-0.44.0.dist-info/RECORD,,