plain 0.13.2__tar.gz → 0.14.0__tar.gz

{plain-0.13.2 → plain-0.14.0}/PKG-INFO

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

{plain-0.13.2 → plain-0.14.0}/plain/cli/cli.py

@@ -422,21 +422,17 @@ class AppCLIGroup(click.Group):
     MODULE_NAME = "app.cli"
 
     def list_commands(self, ctx):
-        try:
-            find_spec(self.MODULE_NAME)
+        if find_spec(self.MODULE_NAME):
             return ["app"]
-        except ModuleNotFoundError:
+        else:
             return []
 
     def get_command(self, ctx, name):
         if name != "app":
             return
 
-        try:
-            cli = importlib.import_module(self.MODULE_NAME)
-            return cli.cli
-        except ModuleNotFoundError:
-            return
+        cli = importlib.import_module(self.MODULE_NAME)
+        return cli.cli
 
 
 class PlainCommandCollection(click.CommandCollection):

{plain-0.13.2 → plain-0.14.0}/plain/cli/packages.py

@@ -36,11 +36,15 @@ class InstalledPackagesGroup(click.Group):
     def get_command(self, ctx, name):
         # Try it as plain.x and just x (we don't know ahead of time which it is, but prefer plain.x)
         for n in [self.PLAIN_APPS_PREFIX + name, name]:
-            try:
-                cli = importlib.import_module(f"{n}.{self.MODULE_NAME}")
-            except ModuleNotFoundError:
+            if not find_spec(n):
+                # plain.<name> doesn't exist at all
+                continue
+
+            if not find_spec(f"{n}.{self.MODULE_NAME}"):
                 continue
 
+            cli = importlib.import_module(f"{n}.{self.MODULE_NAME}")
+
             # Get the app's cli.py group
             try:
                 return cli.cli

{plain-0.13.2 → plain-0.14.0}/plain/http/response.py

@@ -7,6 +7,7 @@ import re
 import sys
 import time
 from email.header import Header
+from functools import cached_property
 from http.client import responses
 from http.cookies import SimpleCookie
 from urllib.parse import urlparse
@@ -423,6 +424,10 @@ class Response(ResponseBase):
         # Create a list of properly encoded bytestrings to support write().
         self._container = [content]
 
+    @cached_property
+    def text(self):
+        return self.content.decode(self.charset or "utf-8")
+
     def __iter__(self):
         return iter(self._container)
 

{plain-0.13.2 → plain-0.14.0}/plain/runtime/user_settings.py

@@ -4,6 +4,7 @@ import os
 import time
 import types
 import typing
+from importlib.util import find_spec
 from pathlib import Path
 
 from plain.exceptions import ImproperlyConfigured
@@ -101,12 +102,11 @@ class Settings:
 
     def _load_default_settings(self, settings_module):
         for entry in getattr(settings_module, "INSTALLED_PACKAGES", []):
-            try:
-                if isinstance(entry, PackageConfig):
-                    app_settings = entry.module.default_settings
-                else:
-                    app_settings = importlib.import_module(f"{entry}.default_settings")
-            except ModuleNotFoundError:
+            if isinstance(entry, PackageConfig):
+                app_settings = entry.module.default_settings
+            elif find_spec(f"{entry}.default_settings"):
+                app_settings = importlib.import_module(f"{entry}.default_settings")
+            else:
                 continue
 
             self._load_module_settings(app_settings)

{plain-0.13.2 → plain-0.14.0}/plain/test/client.py

@@ -5,7 +5,6 @@ import sys
 from functools import partial
 from http import HTTPStatus
 from http.cookies import SimpleCookie
-from importlib import import_module
 from io import BytesIO, IOBase
 from itertools import chain
 from urllib.parse import unquote_to_bytes, urljoin, urlparse, urlsplit
@@ -21,6 +20,7 @@ from plain.utils.encoding import force_bytes
 from plain.utils.functional import SimpleLazyObject
 from plain.utils.http import urlencode
 from plain.utils.itercompat import is_iterable
+from plain.utils.module_loading import import_string
 from plain.utils.regex_helper import _lazy_re_compile
 
 __all__ = (
@@ -562,11 +562,11 @@ class ClientMixin:
     @property
     def session(self):
         """Return the current session variables."""
-        engine = import_module(settings.SESSION_ENGINE)
+        Session = import_string(settings.SESSION_CLASS)
         cookie = self.cookies.get(settings.SESSION_COOKIE_NAME)
         if cookie:
-            return engine.SessionStore(cookie.value)
-        session = engine.SessionStore()
+            return Session(cookie.value)
+        session = Session()
         session.save()
         self.cookies[settings.SESSION_COOKIE_NAME] = session.session_key
         return session
@@ -582,8 +582,8 @@ class ClientMixin:
         if self.session:
             request.session = self.session
         else:
-            engine = import_module(settings.SESSION_ENGINE)
-            request.session = engine.SessionStore()
+            Session = import_string(settings.SESSION_CLASS)
+            request.session = Session()
         login(request, user)
         # Save the session values.
         request.session.save()
@@ -608,8 +608,8 @@ class ClientMixin:
             request.session = self.session
             request.user = get_user(request)
         else:
-            engine = import_module(settings.SESSION_ENGINE)
-            request.session = engine.SessionStore()
+            Session = import_string(settings.SESSION_CLASS)
+            request.session = Session()
         logout(request)
         self.cookies = SimpleCookie()
 

{plain-0.13.2 → plain-0.14.0}/plain/views/forms.py

@@ -40,7 +40,7 @@ class FormView(TemplateView):
             )
         return kwargs
 
-    def get_success_url(self) -> str:
+    def get_success_url(self, form: "BaseForm") -> str:
         """Return the URL to redirect to after processing a valid form."""
         if not self.success_url:
             raise ImproperlyConfigured("No URL to redirect to. Provide a success_url.")
@@ -48,7 +48,7 @@ class FormView(TemplateView):
 
     def form_valid(self, form: "BaseForm") -> Response:
         """If the form is valid, redirect to the supplied URL."""
-        return ResponseRedirect(self.get_success_url())
+        return ResponseRedirect(self.get_success_url(form))
 
     def form_invalid(self, form: "BaseForm") -> Response:
         """If the form is invalid, render the invalid form."""

{plain-0.13.2 → plain-0.14.0}/plain/views/objects.py

@@ -93,7 +93,7 @@ class CreateView(ObjectTemplateViewMixin, FormView):
         self.object = None
 
     # TODO? would rather you have to specify this...
-    def get_success_url(self):
+    def get_success_url(self, form):
         """Return the URL to redirect to after processing a valid form."""
         if self.success_url:
             url = self.success_url.format(**self.object.__dict__)
@@ -126,7 +126,7 @@ class UpdateView(ObjectTemplateViewMixin, FormView):
         self.load_object()
         return super().post()
 
-    def get_success_url(self):
+    def get_success_url(self, form):
         """Return the URL to redirect to after processing a valid form."""
         if self.success_url:
             url = self.success_url.format(**self.object.__dict__)

{plain-0.13.2 → plain-0.14.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain"
-version = "0.13.2"
+version = "0.14.0"
 description = "A web framework for building products with Python."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 readme = "README.md"

{plain-0.13.2 → plain-0.14.0}/uv.lock

@@ -102,7 +102,7 @@ wheels = [
 
 [[package]]
 name = "plain"
-version = "0.13.1"
+version = "0.14.0"
 source = { editable = "." }
 dependencies = [
     { name = "click" },

plain-0.13.2/plain/utils/termcolors.py

@@ -1,221 +0,0 @@
-"""
-termcolors.py
-"""
-
-color_names = ("black", "red", "green", "yellow", "blue", "magenta", "cyan", "white")
-foreground = {color_names[x]: f"3{x}" for x in range(8)}
-background = {color_names[x]: f"4{x}" for x in range(8)}
-
-RESET = "0"
-opt_dict = {
-    "bold": "1",
-    "underscore": "4",
-    "blink": "5",
-    "reverse": "7",
-    "conceal": "8",
-}
-
-
-def colorize(text="", opts=(), **kwargs):
-    """
-    Return your text, enclosed in ANSI graphics codes.
-
-    Depends on the keyword arguments 'fg' and 'bg', and the contents of
-    the opts tuple/list.
-
-    Return the RESET code if no parameters are given.
-
-    Valid colors:
-        'black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white'
-
-    Valid options:
-        'bold'
-        'underscore'
-        'blink'
-        'reverse'
-        'conceal'
-        'noreset' - string will not be auto-terminated with the RESET code
-
-    Examples:
-        colorize('hello', fg='red', bg='blue', opts=('blink',))
-        colorize()
-        colorize('goodbye', opts=('underscore',))
-        print(colorize('first line', fg='red', opts=('noreset',)))
-        print('this should be red too')
-        print(colorize('and so should this'))
-        print('this should not be red')
-    """
-    code_list = []
-    if text == "" and len(opts) == 1 and opts[0] == "reset":
-        return f"\x1b[{RESET}m"
-    for k, v in kwargs.items():
-        if k == "fg":
-            code_list.append(foreground[v])
-        elif k == "bg":
-            code_list.append(background[v])
-    for o in opts:
-        if o in opt_dict:
-            code_list.append(opt_dict[o])
-    if "noreset" not in opts:
-        text = "{}\x1b[{}m".format(text or "", RESET)
-    return "{}{}".format(("\x1b[{}m".format(";".join(code_list))), text or "")
-
-
-def make_style(opts=(), **kwargs):
-    """
-    Return a function with default parameters for colorize()
-
-    Example:
-        bold_red = make_style(opts=('bold',), fg='red')
-        print(bold_red('hello'))
-        KEYWORD = make_style(fg='yellow')
-        COMMENT = make_style(fg='blue', opts=('bold',))
-    """
-    return lambda text: colorize(text, opts, **kwargs)
-
-
-NOCOLOR_PALETTE = "nocolor"
-DARK_PALETTE = "dark"
-LIGHT_PALETTE = "light"
-
-PALETTES = {
-    NOCOLOR_PALETTE: {
-        "ERROR": {},
-        "SUCCESS": {},
-        "WARNING": {},
-        "NOTICE": {},
-        "SQL_FIELD": {},
-        "SQL_COLTYPE": {},
-        "SQL_KEYWORD": {},
-        "SQL_TABLE": {},
-        "HTTP_INFO": {},
-        "HTTP_SUCCESS": {},
-        "HTTP_REDIRECT": {},
-        "HTTP_NOT_MODIFIED": {},
-        "HTTP_BAD_REQUEST": {},
-        "HTTP_NOT_FOUND": {},
-        "HTTP_SERVER_ERROR": {},
-        "MIGRATE_HEADING": {},
-        "MIGRATE_LABEL": {},
-    },
-    DARK_PALETTE: {
-        "ERROR": {"fg": "red", "opts": ("bold",)},
-        "SUCCESS": {"fg": "green", "opts": ("bold",)},
-        "WARNING": {"fg": "yellow", "opts": ("bold",)},
-        "NOTICE": {"fg": "red"},
-        "SQL_FIELD": {"fg": "green", "opts": ("bold",)},
-        "SQL_COLTYPE": {"fg": "green"},
-        "SQL_KEYWORD": {"fg": "yellow"},
-        "SQL_TABLE": {"opts": ("bold",)},
-        "HTTP_INFO": {"opts": ("bold",)},
-        "HTTP_SUCCESS": {},
-        "HTTP_REDIRECT": {"fg": "green"},
-        "HTTP_NOT_MODIFIED": {"fg": "cyan"},
-        "HTTP_BAD_REQUEST": {"fg": "red", "opts": ("bold",)},
-        "HTTP_NOT_FOUND": {"fg": "yellow"},
-        "HTTP_SERVER_ERROR": {"fg": "magenta", "opts": ("bold",)},
-        "MIGRATE_HEADING": {"fg": "cyan", "opts": ("bold",)},
-        "MIGRATE_LABEL": {"opts": ("bold",)},
-    },
-    LIGHT_PALETTE: {
-        "ERROR": {"fg": "red", "opts": ("bold",)},
-        "SUCCESS": {"fg": "green", "opts": ("bold",)},
-        "WARNING": {"fg": "yellow", "opts": ("bold",)},
-        "NOTICE": {"fg": "red"},
-        "SQL_FIELD": {"fg": "green", "opts": ("bold",)},
-        "SQL_COLTYPE": {"fg": "green"},
-        "SQL_KEYWORD": {"fg": "blue"},
-        "SQL_TABLE": {"opts": ("bold",)},
-        "HTTP_INFO": {"opts": ("bold",)},
-        "HTTP_SUCCESS": {},
-        "HTTP_REDIRECT": {"fg": "green", "opts": ("bold",)},
-        "HTTP_NOT_MODIFIED": {"fg": "green"},
-        "HTTP_BAD_REQUEST": {"fg": "red", "opts": ("bold",)},
-        "HTTP_NOT_FOUND": {"fg": "red"},
-        "HTTP_SERVER_ERROR": {"fg": "magenta", "opts": ("bold",)},
-        "MIGRATE_HEADING": {"fg": "cyan", "opts": ("bold",)},
-        "MIGRATE_LABEL": {"opts": ("bold",)},
-    },
-}
-DEFAULT_PALETTE = DARK_PALETTE
-
-
-def parse_color_setting(config_string):
-    """Parse a DJANGO_COLORS environment variable to produce the system palette
-
-    The general form of a palette definition is:
-
-        "palette;role=fg;role=fg/bg;role=fg,option,option;role=fg/bg,option,option"
-
-    where:
-        palette is a named palette; one of 'light', 'dark', or 'nocolor'.
-        role is a named style used by Django
-        fg is a foreground color.
-        bg is a background color.
-        option is a display options.
-
-    Specifying a named palette is the same as manually specifying the individual
-    definitions for each role. Any individual definitions following the palette
-    definition will augment the base palette definition.
-
-    Valid roles:
-        'error', 'success', 'warning', 'notice', 'sql_field', 'sql_coltype',
-        'sql_keyword', 'sql_table', 'http_info', 'http_success',
-        'http_redirect', 'http_not_modified', 'http_bad_request',
-        'http_not_found', 'http_server_error', 'migrate_heading',
-        'migrate_label'
-
-    Valid colors:
-        'black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white'
-
-    Valid options:
-        'bold', 'underscore', 'blink', 'reverse', 'conceal', 'noreset'
-    """
-    if not config_string:
-        return PALETTES[DEFAULT_PALETTE]
-
-    # Split the color configuration into parts
-    parts = config_string.lower().split(";")
-    palette = PALETTES[NOCOLOR_PALETTE].copy()
-    for part in parts:
-        if part in PALETTES:
-            # A default palette has been specified
-            palette.update(PALETTES[part])
-        elif "=" in part:
-            # Process a palette defining string
-            definition = {}
-
-            # Break the definition into the role,
-            # plus the list of specific instructions.
-            # The role must be in upper case
-            role, instructions = part.split("=")
-            role = role.upper()
-
-            styles = instructions.split(",")
-            styles.reverse()
-
-            # The first instruction can contain a slash
-            # to break apart fg/bg.
-            colors = styles.pop().split("/")
-            colors.reverse()
-            fg = colors.pop()
-            if fg in color_names:
-                definition["fg"] = fg
-            if colors and colors[-1] in color_names:
-                definition["bg"] = colors[-1]
-
-            # All remaining instructions are options
-            opts = tuple(s for s in styles if s in opt_dict)
-            if opts:
-                definition["opts"] = opts
-
-            # The nocolor palette has all available roles.
-            # Use that palette as the basis for determining
-            # if the role is valid.
-            if role in PALETTES[NOCOLOR_PALETTE] and definition:
-                palette[role] = definition
-
-    # If there are no colors specified, return the empty palette.
-    if palette == PALETTES[NOCOLOR_PALETTE]:
-        return None
-    return palette