wagtail 7.1.2__py3-none-any.whl → 7.2rc1__py3-none-any.whl

wagtail/project_template/project_name/settings/base.py

@@ -10,11 +10,11 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/{{ docs_version }}/ref/settings/
 """
 
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-import os
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+from pathlib import Path
 
-PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-BASE_DIR = os.path.dirname(PROJECT_DIR)
+PROJECT_DIR = Path(__file__).resolve().parent.parent
+BASE_DIR = PROJECT_DIR.parent
 
 
 # Quick-start development settings - unsuitable for production
@@ -65,7 +65,7 @@ TEMPLATES = [
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
         "DIRS": [
-            os.path.join(PROJECT_DIR, "templates"),
+            PROJECT_DIR / "templates",
         ],
         "APP_DIRS": True,
         "OPTIONS": {
@@ -88,7 +88,7 @@ WSGI_APPLICATION = "{{ project_name }}.wsgi.application"
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.sqlite3",
-        "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
+        "NAME": BASE_DIR / "db.sqlite3",
     }
 }
 
@@ -133,13 +133,13 @@ STATICFILES_FINDERS = [
 ]
 
 STATICFILES_DIRS = [
-    os.path.join(PROJECT_DIR, "static"),
+    PROJECT_DIR / "static",
 ]
 
-STATIC_ROOT = os.path.join(BASE_DIR, "static")
+STATIC_ROOT = BASE_DIR / "static"
 STATIC_URL = "/static/"
 
-MEDIA_ROOT = os.path.join(BASE_DIR, "media")
+MEDIA_ROOT = BASE_DIR / "media"
 MEDIA_URL = "/media/"
 
 # Default storage settings

wagtail/project_template/requirements.txt

@@ -1,2 +1,2 @@
 Django>=5.2,<5.3
-wagtail>=7.1,<7.2
+wagtail==7.2rc1

wagtail/query.py

@@ -725,7 +725,11 @@ class SpecificIterable(ModelIterable):
                     "This is most likely because a database migration has removed "
                     "the relevant table or record since the item was created:\n{}".format(
                         [
-                            {"id": p.id, "title": p.title, "type": p.content_type}
+                            {
+                                "id": p.id,
+                                "title": getattr(p, "title", str(p)),
+                                "type": p.content_type,
+                            }
                             for p in generic_items.values()
                         ]
                     ),
@@ -774,7 +778,8 @@ class DeferredSpecificIterable(ModelIterable):
                 warnings.warn(
                     "A specific version of the following object could not be returned "
                     "because the specific model is not present on the active "
-                    f"branch: <{obj.__class__.__name__} id='{obj.id}' title='{obj.title}' "
+                    f"branch: <{obj.__class__.__name__} id='{obj.id}' "
+                    f"title='{getattr(obj, 'title', str(obj))}' "
                     f"type='{obj.content_type}'>",
                     category=RuntimeWarning,
                 )

wagtail/rich_text/rewriters.py

@@ -4,7 +4,7 @@ Utility classes for rewriting elements of HTML-like strings
 
 import re
 from collections import defaultdict
-from typing import Callable
+from collections.abc import Callable
 
 from django.utils.functional import cached_property
 

wagtail/search/apps.py

@@ -1,55 +1,10 @@
-from django.apps import AppConfig
-from django.core.checks import Tags, Warning, register
-from django.db import connection
 from django.utils.translation import gettext_lazy as _
+from wagtailmodelsearch.apps import ModelSearchAppConfig
 
-from wagtail.search.signal_handlers import register_signal_handlers
 
-from . import checks  # NOQA: F401
-
-
-class WagtailSearchAppConfig(AppConfig):
+class WagtailSearchAppConfig(ModelSearchAppConfig):
     name = "wagtail.search"
     label = "wagtailsearch"
     verbose_name = _("Wagtail search")
-    default_auto_field = "django.db.models.AutoField"
-
-    def ready(self):
-        register_signal_handlers()
-
-        if connection.vendor == "postgresql":
-            # Only PostgreSQL has support for tsvector weights
-            from wagtail.search.backends.database.postgres.weights import set_weights
-
-            set_weights()
-
-        from wagtail.search.models import IndexEntry
-
-        IndexEntry.add_generic_relations()
-
-    @register(Tags.compatibility, Tags.database)
-    def check_if_sqlite_version_is_supported(app_configs, **kwargs):
-        if connection.vendor == "sqlite":
-            import sqlite3
-
-            from wagtail.search.backends.database.sqlite.utils import fts5_available
-
-            if sqlite3.sqlite_version_info < (3, 19, 0):
-                return [
-                    Warning(
-                        "Your SQLite version is older than 3.19.0. A fallback search backend will be used instead.",
-                        hint="Upgrade your SQLite version to at least 3.19.0",
-                        id="wagtailsearch.W002",
-                        obj=WagtailSearchAppConfig,
-                    )
-                ]
-            elif not fts5_available():
-                return [
-                    Warning(
-                        "Your SQLite installation is missing the fts5 extension. A fallback search backend will be used instead.",
-                        hint="Upgrade your SQLite installation to a version with fts5 enabled",
-                        id="wagtailsearch.W003",
-                        obj=WagtailSearchAppConfig,
-                    )
-                ]
-        return []
+    backend_setting_name = "WAGTAILSEARCH_BACKENDS"
+    default = True

wagtail/search/backends/__init__.py

@@ -1,113 +1 @@
-# Backend loading
-# Based on the Django cache framework
-# https://github.com/django/django/blob/5d263dee304fdaf95e18d2f0619d6925984a7f02/django/core/cache/__init__.py
-
-from importlib import import_module
-
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-from django.utils.module_loading import import_string
-
-
-class InvalidSearchBackendError(ImproperlyConfigured):
-    pass
-
-
-def get_search_backend_config():
-    search_backends = getattr(settings, "WAGTAILSEARCH_BACKENDS", {})
-
-    # Make sure the default backend is always defined
-    search_backends.setdefault(
-        "default",
-        {
-            "BACKEND": "wagtail.search.backends.database",
-        },
-    )
-
-    return search_backends
-
-
-def import_backend(dotted_path):
-    """
-    There's two formats for the dotted_path.
-    One with the backend class (old) and one without (new)
-    eg:
-      old: wagtail.search.backends.elasticsearch.ElasticsearchSearchBackend
-      new: wagtail.search.backends.elasticsearch
-
-    If a new style dotted path was specified, this function would
-    look for a backend class from the "SearchBackend" attribute.
-    """
-    try:
-        # New
-        backend_module = import_module(dotted_path)
-        return backend_module.SearchBackend
-    except ImportError as e:
-        try:
-            # Old
-            return import_string(dotted_path)
-        except ImportError:
-            raise ImportError from e
-
-
-def get_search_backend(backend="default", **kwargs):
-    search_backends = get_search_backend_config()
-
-    # Try to find the backend
-    try:
-        # Try to get the WAGTAILSEARCH_BACKENDS entry for the given backend name first
-        conf = search_backends[backend]
-    except KeyError:
-        try:
-            # Trying to import the given backend, in case it's a dotted path
-            import_backend(backend)
-        except ImportError as e:
-            raise InvalidSearchBackendError(f"Could not find backend '{backend}': {e}")
-        params = kwargs
-    else:
-        # Backend is a conf entry
-        params = conf.copy()
-        params.update(kwargs)
-        backend = params.pop("BACKEND")
-
-    # Try to import the backend
-    try:
-        backend_cls = import_backend(backend)
-    except ImportError as e:
-        raise InvalidSearchBackendError(f"Could not find backend '{backend}': {e}")
-
-    # Create backend
-    return backend_cls(params)
-
-
-def _backend_requires_auto_update(backend_name, params):
-    if params.get("AUTO_UPDATE", True):
-        return True
-
-    # _WAGTAILSEARCH_FORCE_AUTO_UPDATE is only used by Wagtail tests. It allows
-    # us to test AUTO_UPDATE behaviour against Elasticsearch without having to
-    # have AUTO_UPDATE enabed for every test.
-    force_auto_update = getattr(settings, "_WAGTAILSEARCH_FORCE_AUTO_UPDATE", [])
-    if backend_name in force_auto_update:
-        return True
-
-    return False
-
-
-def get_search_backends_with_name(with_auto_update=False):
-    search_backends = get_search_backend_config()
-    for backend, params in search_backends.items():
-        if with_auto_update and _backend_requires_auto_update(backend, params) is False:
-            continue
-
-        yield backend, get_search_backend(backend)
-
-
-def get_search_backends(with_auto_update=False):
-    # For backwards compatibility
-    return (
-        backend
-        for _, backend in get_search_backends_with_name(
-            with_auto_update=with_auto_update
-        )
-    )
+from wagtailmodelsearch.backends import *  # noqa: F403