plain 0.47.0__tar.gz → 0.48.0__tar.gz

{plain-0.47.0 → plain-0.48.0}/.gitignore

@@ -6,6 +6,9 @@ __pycache__
 *.DS_Store
 .coverage
 
+# Personal workspace
+/*.code-workspace
+
 # Test apps
 plain*/tests/.plain
 

{plain-0.47.0 → plain-0.48.0}/PKG-INFO

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

{plain-0.47.0 → plain-0.48.0}/plain/runtime/README.md

@@ -85,7 +85,7 @@ DATABASES: dict
 # Automatically configure DATABASES if a DATABASE_URL was given in the environment
 if "DATABASE_URL" in environ:
     DATABASES = {
-        "default": database_url.parse(
+        "default": database_url.parse_database_url(
             environ["DATABASE_URL"],
             # Enable persistent connections by default
             conn_max_age=int(environ.get("DATABASE_CONN_MAX_AGE", 600)),

{plain-0.47.0 → plain-0.48.0}/plain/templates/jinja/__init__.py

@@ -1,3 +1,4 @@
+import importlib.util
 from importlib import import_module
 
 from plain.packages import packages_registry
@@ -25,24 +26,21 @@ class JinjaEnvironment(LazyObject):
         self._wrapped = env
 
         for package_config in packages_registry.get_package_configs():
-            # Allow this to fail in case there are import errors inside of their file
+            # Autoload template helpers if the package provides a ``templates`` module
             import_name = f"{package_config.name}.templates"
             if import_name in self._imported_modules:
                 continue
-            try:
-                import_module(import_name)
-                self._imported_modules.add(import_name)
-            except ModuleNotFoundError:
-                pass
+            if importlib.util.find_spec(import_name) is None:
+                continue
+            import_module(import_name)
+            self._imported_modules.add(import_name)
 
-        # Allow this to fail in case there are import errors inside of their file
+        # Autoload template helpers from the local ``app`` package if present
         import_name = "app.templates"
         if import_name not in self._imported_modules:
-            try:
+            if importlib.util.find_spec(import_name) is not None:
                 import_module(import_name)
                 self._imported_modules.add(import_name)
-            except ModuleNotFoundError:
-                pass
 
 
 environment = JinjaEnvironment()

{plain-0.47.0 → plain-0.48.0}/plain/views/templates.py

@@ -1,5 +1,6 @@
 from plain.csrf.middleware import get_token
 from plain.exceptions import ImproperlyConfigured
+from plain.http import Response
 from plain.runtime import settings
 from plain.templates import Template, TemplateFileMissing
 from plain.utils.functional import lazy
@@ -69,5 +70,5 @@ class TemplateView(View):
     def render_template(self) -> str:
         return self.get_template().render(self.get_template_context())
 
-    def get(self):
-        return self.render_template()
+    def get(self) -> Response:
+        return Response(self.render_template())

{plain-0.47.0 → plain-0.48.0}/pyproject.toml

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

plain-0.47.0/plain/utils/connection.py

@@ -1,84 +0,0 @@
-from functools import cached_property
-from threading import local
-
-from plain.runtime import settings as plain_settings
-
-
-class ConnectionProxy:
-    """Proxy for accessing a connection object's attributes."""
-
-    def __init__(self, connections, alias):
-        self.__dict__["_connections"] = connections
-        self.__dict__["_alias"] = alias
-
-    def __getattr__(self, item):
-        return getattr(self._connections[self._alias], item)
-
-    def __setattr__(self, name, value):
-        return setattr(self._connections[self._alias], name, value)
-
-    def __delattr__(self, name):
-        return delattr(self._connections[self._alias], name)
-
-    def __contains__(self, key):
-        return key in self._connections[self._alias]
-
-    def __eq__(self, other):
-        return self._connections[self._alias] == other
-
-
-class ConnectionDoesNotExist(Exception):
-    pass
-
-
-class BaseConnectionHandler:
-    settings_name = None
-    exception_class = ConnectionDoesNotExist
-
-    def __init__(self, settings=None):
-        self._settings = settings
-        self._connections = local()
-
-    @cached_property
-    def settings(self):
-        self._settings = self.configure_settings(self._settings)
-        return self._settings
-
-    def configure_settings(self, settings):
-        if settings is None:
-            settings = getattr(plain_settings, self.settings_name)
-        return settings
-
-    def create_connection(self, alias):
-        raise NotImplementedError("Subclasses must implement create_connection().")
-
-    def __getitem__(self, alias):
-        try:
-            return getattr(self._connections, alias)
-        except AttributeError:
-            if alias not in self.settings:
-                raise self.exception_class(f"The connection '{alias}' doesn't exist.")
-        conn = self.create_connection(alias)
-        setattr(self._connections, alias, conn)
-        return conn
-
-    def __setitem__(self, key, value):
-        setattr(self._connections, key, value)
-
-    def __delitem__(self, key):
-        delattr(self._connections, key)
-
-    def __iter__(self):
-        return iter(self.settings)
-
-    def all(self, initialized_only=False):
-        return [
-            self[alias]
-            for alias in self
-            # If initialized_only is True, return only initialized connections.
-            if not initialized_only or hasattr(self._connections, alias)
-        ]
-
-    def close_all(self):
-        for conn in self.all(initialized_only=True):
-            conn.close()