Fix cache invalidation (#131)

This reverts commit 46be8fc748.

.coveragerc

@@ -0,0 +1,6 @@
+[run]
+source = dbtemplates
+branch = 1
+
+[report]
+omit = *tests*,*/migrations/*,test_*

.github/workflows/release.yml

@@ -0,0 +1,40 @@
+name: Release
+
+on:
+  push:
+    tags:
+    - '*'
+
+jobs:
+  build:
+    if: github.repository == 'jazzband/django-dbtemplates'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install -U pip
+          python -m pip install -U setuptools twine wheel
+
+      - name: Build package
+        run: |
+          python setup.py --version
+          python setup.py sdist --format=gztar bdist_wheel
+          twine check dist/*
+
+      - name: Upload packages to Jazzband
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: jazzband
+          password: ${{ secrets.JAZZBAND_RELEASE_KEY }}
+          repository_url: https://jazzband.co/projects/django-dbtemplates/upload

.github/workflows/test.yml

@@ -0,0 +1,48 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      max-parallel: 5
+      matrix:
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.13']
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Get pip cache dir
+      id: pip-cache
+      run: |
+        echo "::set-output name=dir::$(pip cache dir)"
+
+    - name: Cache
+      uses: actions/cache@v3
+      with:
+        path: ${{ steps.pip-cache.outputs.dir }}
+        key:
+          ${{ matrix.python-version }}-v1-${{ hashFiles('**/setup.py') }}-${{ hashFiles('**/tox.ini') }}
+        restore-keys: |
+          ${{ matrix.python-version }}-v1-
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install --upgrade tox tox-gh-actions
+
+    - name: Tox tests
+      run: |
+        tox -v
+
+    - name: Upload coverage
+      uses: codecov/codecov-action@v2
+      with:
+        name: Python ${{ matrix.python-version }}

.gitignore

@@ -1,10 +1,14 @@
+.*
+!.gitignore
+!.coveragerc
 *.pyc
 .*.swp
 MANIFEST
 build
 dist
 *.egg-info
-example/example.db
 docs/_build
 .tox/
-*.egg/
+*.egg/
+.coverage
+coverage.xml

.hgignore

@@ -1,9 +0,0 @@
-syntax: glob
-*.pyc
-.*.swp
-MANIFEST
-build
-dist
-django_dbtemplates.egg-info/
-example/example.db
-docs/_build

.hgtags

@@ -1,24 +0,0 @@
-bd537cd8beba30f1a26328e02126d3d1b14ebf8f 0.2.5
-1b426859f05b8a003411964883ed5d42ec6c1b01 0.3.0
-97da228cc698bfae05f60a68ec978030722b0777 0.3.1
-50c69325d3758d2e82541b13be2794ebbe9ee449 0.4.0
-d35a41ea96d3604a3c2654590c5c76b8865c4251 0.4.1
-a4bd56a7c2ea4c6f16a726e47bb185101934fe08 0.4.2
-447247c1ce1fbc77ac79c5855630af306f4f8c42 0.4.3
-5b2e4f7fc267daf71325991e913f98e6f96259bb 0.4.4
-ea4d636f3459ddbb51d87e921cf23f87e41d658d 0.4.5
-9a30f34bc5b07376ed6752eed94d9d58e791fbac 0.4.6
-9dc2a0e48494d6a354f5ca25db31638cede4bae4 0.4.7
-a3be97628ed8633e2fe232e6680474e7fd3e9fea 0.5.0
-bf3db2fe192d4a02bf531e61e23df342c36d6b1b 0.5.1
-67a86cf9f7c8ac8d9da855c13abbef2547033cce 0.5.2
-6967bbbee378f470e4b1df02b57112dd050d424b 0.5.3
-5965315c03c1a8c1cfb34752cca3802d68156e27 0.5.4
-4109e0db4340042cb85ea8a7d2b6ce37245738c6 0.5.5
-ade167225d06cb6888ea8bfa84e7d020590171c6 0.5.6
-dff01be9c8af328f8fcbc2fc97edcbe8d97840e2 0.5.7
-f8f7eaf275c5e8ac52174642265af55691abef7c 0.5.8
-4b36382cdfd756f45f81b0d042aaf331c3eabe30 0.6.0
-0ac352fec2c2a03ac801ff0c40f0649ef16e1f64 0.6.1
-34a0511928629872ce8cc5f94c6bed65f82ac343 0.7.0
-74c22fa8c4a64ea37f9b6b2515a4162b8b8b1a2a 0.7.1

.pre-commit-config.yaml

@@ -0,0 +1,15 @@
+repos:
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.34.0
+    hooks:
+      - id: pyupgrade
+        args: [--py37-plus]
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: check-merge-conflict
+      - id: check-yaml
+
+ci:
+  autoupdate_schedule: quarterly

.readthedocs.yaml

@@ -0,0 +1,25 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-20.04
+  tools:
+    python: "3.9"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+   configuration: docs/conf.py
+
+# If using Sphinx, optionally build your docs in additional formats such as PDF
+formats:
+   - pdf
+
+# Optionally declare the Python requirements required to build your docs
+python:
+   install:
+   - requirements: requirements/docs.txt

.tx/config

@@ -1,8 +1,7 @@
-[django-dbtemplates.django]
+[django-dbtemplates.main]
 file_filter = dbtemplates/locale/<lang>/LC_MESSAGES/django.po
 source_file = dbtemplates/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
 [main]
-host = https://www.transifex.net
-
+host = https://www.transifex.com

AUTHORS

@@ -0,0 +1,18 @@
+Alen Mujezinovic
+Alex Gaynor
+Alex Kamedov
+Alexander Artemenko
+Arne Brodowski
+David Paccoud
+Diego Búrigo Zacarão
+Dmitry Falk
+Jannis Leidel
+Jure Cuhalev
+Jason Mayfield
+Kevin Mooney
+Mark Stahler
+Matt Dorn
+Oliver George
+Selwin Ong
+Stephan Peijnik <spe@anexia.at>, ANEXIA Internetdienstleistungs GmbH, http://www.anexia.at/
+Zhang Kun

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Code of Conduct
+
+As contributors and maintainers of the Jazzband projects, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating documentation,
+submitting pull requests or patches, and other activities.
+
+We are committed to making participation in the Jazzband a harassment-free experience
+for everyone, regardless of the level of experience, gender, gender identity and
+expression, sexual orientation, disability, personal appearance, body size, race,
+ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery
+- Personal attacks
+- Trolling or insulting/derogatory comments
+- Public or private harassment
+- Publishing other's private information, such as physical or electronic addresses,
+  without explicit permission
+- Other unethical or unprofessional conduct
+
+The Jazzband roadies have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are not
+aligned to this Code of Conduct, or to ban temporarily or permanently any contributor
+for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, the roadies commit themselves to fairly and
+consistently applying these principles to every aspect of managing the jazzband
+projects. Roadies who do not follow or enforce the Code of Conduct may be permanently
+removed from the Jazzband roadies.
+
+This code of conduct applies both within project spaces and in public spaces when an
+individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
+contacting the roadies at `roadies@jazzband.co`. All complaints will be reviewed and
+investigated and will result in a response that is deemed necessary and appropriate to
+the circumstances. Roadies are obligated to maintain confidentiality with regard to the
+reporter of an incident.
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version
+1.3.0, available at [https://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: https://contributor-covenant.org
+[version]: https://contributor-covenant.org/version/1/3/0/

CONTRIBUTING.md

@@ -0,0 +1,3 @@
+[![Jazzband](https://jazzband.co/static/img/jazzband.svg)](https://jazzband.co/)
+
+This is a [Jazzband](https://jazzband.co/) project. By contributing you agree to abide by the [Contributor Code of Conduct](https://jazzband.co/docs/conduct) and follow the [guidelines](https://jazzband.co/docs/guidelines).

INSTALL

@@ -1,17 +0,0 @@
-To install it, run the following command inside this directory:
-
-    python setup.py install
-
-Or if you'd prefer you can simply place the included ``dbtemplates``
-directory somewhere on your Python path, or symlink to it from
-somewhere on your Python path; this is useful if you're working from a
-Subversion checkout. Since ``dbtemplates`` is registered in the
-Python Package Index you can also run ``easy_install django-dbtemplates``
-or ``pip install django-dbtemplates`` optionally.
-
-Note that this application requires Python 2.3 or later, and a recent
-Subversion checkout of Django. You can obtain Python from
-http://www.python.org/ and Django from http://www.djangoproject.com/.
-
-This install notice was bluntly stolen from James Bennett's registration
-package, http://www.bitbucket.org/ubernostrum/django-registration/

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2010, Jannis Leidel and contributors
+Copyright (c) 2007-2019, Jannis Leidel and contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

MANIFEST.in

@@ -1,7 +1,4 @@
-include INSTALL
-include LICENSE
-include README.rst
-include MANIFEST.in
+include LICENSE AUTHORS README.rst MANIFEST.in tox.ini .coveragerc CONTRIBUTING.md
 recursive-include docs *.txt
 recursive-include dbtemplates/locale *
 recursive-include dbtemplates/static/dbtemplates *.css *.js

README.rst

@@ -1,6 +1,17 @@
 django-dbtemplates
 ==================
 
+.. image:: https://jazzband.co/static/img/badge.svg
+   :alt: Jazzband
+   :target: https://jazzband.co/
+
+.. image:: https://github.com/jazzband/django-dbtemplates/workflows/Test/badge.svg
+    :target: https://github.com/jazzband/django-dbtemplates/actions
+
+.. image:: https://codecov.io/github/jazzband/django-dbtemplates/coverage.svg?branch=master
+   :alt: Codecov
+   :target: https://codecov.io/github/jazzband/django-dbtemplates?branch=master
+
 ``dbtemplates`` is a Django app that consists of two parts:
 
 1. It allows you to store templates in your database
@@ -10,6 +21,10 @@ django-dbtemplates
 It also features optional support for versioned storage and django-admin
 command, integrates with Django's caching system and the admin actions.
 
-Please see http://django-dbtemplates.readthedocs.org/ for more details.
+Please see https://django-dbtemplates.readthedocs.io/ for more details.
 
-.. _template loader: http://docs.djangoproject.com/en/dev/ref/templates/api/#loader-types
+The source code and issue tracker can be found on Github:
+
+https://github.com/jazzband/django-dbtemplates
+
+.. _template loader: http://docs.djangoproject.com/en/dev/ref/templates/api/#loader-types

dbtemplates/__init__.py

@@ -1,16 +1,3 @@
-VERSION = (1, 0, 1, "f", 0)  # following PEP 386
-DEV_N = None
+import importlib.metadata
 
-
-def get_version():
-    version = "%s.%s" % (VERSION[0], VERSION[1])
-    if VERSION[2]:
-        version = "%s.%s" % (version, VERSION[2])
-    if VERSION[3] != "f":
-        version = "%s%s%s" % (version, VERSION[3], VERSION[4])
-        if DEV_N:
-            version = "%s.dev%s" % (version, DEV_N)
-    return version
-
-
-__version__ = get_version()
+__version__ = importlib.metadata.version("django-dbtemplates")

dbtemplates/admin.py

@@ -1,36 +1,44 @@
 import posixpath
 from django import forms
 from django.contrib import admin
-from django.utils.translation import ungettext, ugettext_lazy as _
+from django.core.exceptions import ImproperlyConfigured
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext
 from django.utils.safestring import mark_safe
 
-from dbtemplates import settings
-from dbtemplates.models import (Template,
-    remove_cached_template, add_template_to_cache)
+from dbtemplates.conf import settings
+from dbtemplates.models import Template, add_template_to_cache, remove_cached_template
+from dbtemplates.utils.template import check_template_syntax
 
-# Check if django-reversion is installed and use reversions' VersionAdmin
-# as the base admin class if yes
-if settings.USE_REVERSION:
+# Check if either django-reversion-compare or django-reversion is installed and
+# use reversion_compare's CompareVersionAdmin or reversion's VersionAdmin as
+# the base admin class if yes
+if settings.DBTEMPLATES_USE_REVERSION_COMPARE:
+    from reversion_compare.admin import CompareVersionAdmin \
+        as TemplateModelAdmin
+elif settings.DBTEMPLATES_USE_REVERSION:
     from reversion.admin import VersionAdmin as TemplateModelAdmin
 else:
-    from django.contrib.admin import ModelAdmin as TemplateModelAdmin
+    from django.contrib.admin import ModelAdmin as TemplateModelAdmin  # noqa
 
 
 class CodeMirrorTextArea(forms.Textarea):
+
     """
     A custom widget for the CodeMirror browser editor to be used with the
     content field of the Template model.
     """
     class Media:
-        css = dict(screen=[
-            posixpath.join(settings.MEDIA_PREFIX, 'css/editor.css')])
-        js = [posixpath.join(settings.MEDIA_PREFIX, 'js/codemirror.js')]
+        css = dict(screen=[posixpath.join(
+            settings.DBTEMPLATES_MEDIA_PREFIX, 'css/editor.css')])
+        js = [posixpath.join(settings.DBTEMPLATES_MEDIA_PREFIX,
+                             'js/codemirror.js')]
 
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, attrs=None, renderer=None):
         result = []
         result.append(
-            super(CodeMirrorTextArea, self).render(name, value, attrs))
-        result.append(u"""
+            super().render(name, value, attrs))
+        result.append("""
 <script type="text/javascript">
   var editor = CodeMirror.fromTextArea('id_%(name)s', {
     path: "%(media_prefix)sjs/",
@@ -43,36 +51,53 @@ class CodeMirrorTextArea(forms.Textarea):
     lineNumbers: true
   });
 </script>
-""" % dict(media_prefix=settings.MEDIA_PREFIX, name=name))
-        return mark_safe(u"".join(result))
+""" % dict(media_prefix=settings.DBTEMPLATES_MEDIA_PREFIX, name=name))
+        return mark_safe("".join(result))
 
-if settings.USE_CODEMIRROR:
+
+if settings.DBTEMPLATES_USE_CODEMIRROR:
     TemplateContentTextArea = CodeMirrorTextArea
 else:
     TemplateContentTextArea = forms.Textarea
 
-if settings.AUTO_POPULATE_CONTENT:
+if settings.DBTEMPLATES_AUTO_POPULATE_CONTENT:
     content_help_text = _("Leaving this empty causes Django to look for a "
-        "template with the given name and populate this field with its "
-        "content.")
+                          "template with the given name and populate this "
+                          "field with its content.")
 else:
     content_help_text = ""
 
+if settings.DBTEMPLATES_USE_CODEMIRROR and settings.DBTEMPLATES_USE_TINYMCE:
+    raise ImproperlyConfigured("You may use either CodeMirror or TinyMCE "
+                               "with dbtemplates, not both. Please disable "
+                               "one of them.")
+
+if settings.DBTEMPLATES_USE_TINYMCE:
+    from tinymce.widgets import AdminTinyMCE
+    TemplateContentTextArea = AdminTinyMCE
+elif settings.DBTEMPLATES_USE_REDACTOR:
+    from redactor.widgets import RedactorEditor
+    TemplateContentTextArea = RedactorEditor
+
 
 class TemplateAdminForm(forms.ModelForm):
+
     """
     Custom AdminForm to make the content textarea wider.
     """
     content = forms.CharField(
-        widget=TemplateContentTextArea({'rows': '24'}),
+        widget=TemplateContentTextArea(attrs={'rows': '24'}),
         help_text=content_help_text, required=False)
 
     class Meta:
         model = Template
+        fields = ('name', 'content', 'sites', 'creation_date', 'last_changed')
+        fields = "__all__"
 
 
 class TemplateAdmin(TemplateModelAdmin):
     form = TemplateAdminForm
+    readonly_fields = ['creation_date', 'last_changed']
     fieldsets = (
         (None, {
             'fields': ('name', 'content'),
@@ -86,35 +111,63 @@ class TemplateAdmin(TemplateModelAdmin):
             'classes': ('collapse',),
         }),
     )
+    filter_horizontal = ('sites',)
     list_display = ('name', 'creation_date', 'last_changed', 'site_list')
     list_filter = ('sites',)
+    save_as = True
     search_fields = ('name', 'content')
-    actions = ['invalidate_cache', 'repopulate_cache']
+    actions = ['invalidate_cache', 'repopulate_cache', 'check_syntax']
 
     def invalidate_cache(self, request, queryset):
         for template in queryset:
             remove_cached_template(template)
-        message = ungettext(
+        count = queryset.count()
+        message = ngettext(
             "Cache of one template successfully invalidated.",
             "Cache of %(count)d templates successfully invalidated.",
-            len(queryset))
-        self.message_user(request, message % {'count': len(queryset)})
+            count)
+        self.message_user(request, message % {'count': count})
     invalidate_cache.short_description = _("Invalidate cache of "
                                            "selected templates")
 
     def repopulate_cache(self, request, queryset):
         for template in queryset:
             add_template_to_cache(template)
-        message = ungettext(
+        count = queryset.count()
+        message = ngettext(
             "Cache successfully repopulated with one template.",
             "Cache successfully repopulated with %(count)d templates.",
-            len(queryset))
-        self.message_user(request, message % {'count': len(queryset)})
+            count)
+        self.message_user(request, message % {'count': count})
     repopulate_cache.short_description = _("Repopulate cache with "
                                            "selected templates")
 
+    def check_syntax(self, request, queryset):
+        errors = []
+        for template in queryset:
+            valid, error = check_template_syntax(template)
+            if not valid:
+                errors.append(f'{template.name}: {error}')
+        if errors:
+            count = len(errors)
+            message = ngettext(
+                "Template syntax check FAILED for %(names)s.",
+                "Template syntax check FAILED for "
+                "%(count)d templates: %(names)s.",
+                count)
+            self.message_user(request, message %
+                              {'count': count, 'names': ', '.join(errors)})
+        else:
+            count = queryset.count()
+            message = ngettext(
+                "Template syntax OK.",
+                "Template syntax OK for %(count)d templates.", count)
+            self.message_user(request, message % {'count': count})
+    check_syntax.short_description = _("Check template syntax")
+
     def site_list(self, template):
         return ", ".join([site.name for site in template.sites.all()])
     site_list.short_description = _('sites')
 
+
 admin.site.register(Template, TemplateAdmin)

dbtemplates/apps.py

@@ -0,0 +1,9 @@
+from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
+
+
+class DBTemplatesConfig(AppConfig):
+    name = 'dbtemplates'
+    verbose_name = _('Database templates')
+
+    default_auto_field = 'django.db.models.AutoField'

dbtemplates/conf.py

@@ -0,0 +1,67 @@
+import posixpath
+
+from django.core.exceptions import ImproperlyConfigured
+from django.conf import settings
+
+from appconf import AppConf
+
+
+class DbTemplatesConf(AppConf):
+    USE_CODEMIRROR = False
+    USE_REVERSION = False
+    USE_REVERSION_COMPARE = False
+    USE_TINYMCE = False
+    USE_REDACTOR = False
+    ADD_DEFAULT_SITE = True
+    AUTO_POPULATE_CONTENT = True
+    MEDIA_PREFIX = None
+    CACHE_BACKEND = None
+
+    def configure_media_prefix(self, value):
+        if value is None:
+            base_url = getattr(settings, "STATIC_URL", None)
+            if base_url is None:
+                base_url = settings.MEDIA_URL
+            value = posixpath.join(base_url, "dbtemplates/")
+        return value
+
+    def configure_cache_backend(self, value):
+        # If we are on Django 1.3 AND using the new CACHES setting..
+        if hasattr(settings, "CACHES"):
+            if "dbtemplates" in settings.CACHES:
+                return "dbtemplates"
+            else:
+                return "default"
+        if isinstance(value, str) and value.startswith("dbtemplates."):
+            raise ImproperlyConfigured("Please upgrade to one of the "
+                                       "supported backends as defined "
+                                       "in the Django docs.")
+        return value
+
+    def configure_use_reversion(self, value):
+        if value and 'reversion' not in settings.INSTALLED_APPS:
+            raise ImproperlyConfigured("Please add 'reversion' to your "
+                                       "INSTALLED_APPS setting to make "
+                                       "use of it in dbtemplates.")
+        return value
+
+    def configure_use_reversion_compare(self, value):
+        if value and 'reversion_compare' not in settings.INSTALLED_APPS:
+            raise ImproperlyConfigured("Please add 'reversion_compare' to your"
+                                       " INSTALLED_APPS setting to make "
+                                       "use of it in dbtemplates.")
+        return value
+
+    def configure_use_tinymce(self, value):
+        if value and 'tinymce' not in settings.INSTALLED_APPS:
+            raise ImproperlyConfigured("Please add 'tinymce' to your "
+                                       "INSTALLED_APPS setting to make "
+                                       "use of it in dbtemplates.")
+        return value
+
+    def configure_use_redactor(self, value):
+        if value and 'redactor' not in settings.INSTALLED_APPS:
+            raise ImproperlyConfigured("Please add 'redactor' to your "
+                                       "INSTALLED_APPS setting to make "
+                                       "use of it in dbtemplates.")
+        return value

dbtemplates/loader.py

@@ -1,14 +1,14 @@
-import warnings
-from django import VERSION
-from django.conf import settings
 from django.contrib.sites.models import Site
-from django.template import TemplateDoesNotExist
+from django.db import router
+from django.template import Origin, TemplateDoesNotExist
+from django.template.loaders.base import Loader as BaseLoader
 
 from dbtemplates.models import Template
-from dbtemplates.utils import cache, get_cache_key
+from dbtemplates.utils.cache import (cache, get_cache_key,
+                                     set_and_return, get_cache_notfound_key)
 
 
-def load_template_source(template_name, template_dirs=None, annoy=True):
+class Loader(BaseLoader):
     """
     A custom template loader to load templates from the database.
 
@@ -17,43 +17,71 @@ def load_template_source(template_name, template_dirs=None, annoy=True):
     it falls back to query the database field ``name`` with the template path
     and ``sites`` with the current site.
     """
-    if VERSION[:2] >= (1, 2) and annoy:
-        # For backward compatibility
-        warnings.warn(
-            "`dbtemplates.loader.load_template_source` is deprecated; "
-            "use `dbtemplates.loader.Loader` instead.", DeprecationWarning)
-    site = Site.objects.get_current()
-    display_name = 'db:%s:%s:%s' % (settings.DATABASE_ENGINE,
-                                    template_name, site.domain)
-    cache_key = get_cache_key(template_name)
-    if cache:
-        try:
-            backend_template = cache.get(cache_key)
-            if backend_template:
-                return backend_template, template_name
-        except:
-            pass
-    try:
-        template = Template.on_site.get(name__exact=template_name)
-        # Save in cache backend explicitly if manually deleted or invalidated
+    is_usable = True
+
+    def get_template_sources(self, template_name, template_dirs=None):
+        yield Origin(
+            name=template_name,
+            template_name=template_name,
+            loader=self,
+        )
+
+    def get_contents(self, origin):
+        content, _ = self._load_template_source(origin.template_name)
+        return content
+
+    def _load_and_store_template(self, template_name, cache_key, site,
+                                 **params):
+        template = Template.objects.get(name__exact=template_name, **params)
+        db = router.db_for_read(Template, instance=template)
+        display_name = f'dbtemplates:{db}:{template_name}:{site.domain}'
+        return set_and_return(cache_key, template.content, display_name)
+
+    def _load_template_source(self, template_name, template_dirs=None):
+        # The logic should work like this:
+        # * Try to find the template in the cache. If found, return it.
+        # * Now check the cache if a lookup for the given template
+        #   has failed lately and hand over control to the next template
+        #   loader waiting in line.
+        # * If this still did not fail we first try to find a site-specific
+        #   template in the database.
+        # * On a failure from our last attempt we try to load the global
+        #   template from the database.
+        # * If all of the above steps have failed we generate a new key
+        #   in the cache indicating that queries failed, with the current
+        #   timestamp.
+        site = Site.objects.get_current()
+        cache_key = get_cache_key(template_name)
         if cache:
-            cache.set(cache_key, template.content)
-        return (template.content, display_name)
-    except:
-        pass
-    raise TemplateDoesNotExist(template_name)
-load_template_source.is_usable = True
+            try:
+                backend_template = cache.get(cache_key)
+                if backend_template:
+                    return backend_template, template_name
+            except Exception:
+                pass
 
+        # Not found in cache, move on.
+        cache_notfound_key = get_cache_notfound_key(template_name)
+        if cache:
+            try:
+                notfound = cache.get(cache_notfound_key)
+                if notfound:
+                    raise TemplateDoesNotExist(template_name)
+            except Exception:
+                raise TemplateDoesNotExist(template_name)
 
-if VERSION[:2] >= (1, 2):
-    # providing a class based loader for Django >= 1.2, yay!
-    from django.template.loader import BaseLoader
+        # Not marked as not-found, move on...
 
-    class Loader(BaseLoader):
-        __doc__ = load_template_source.__doc__
+        try:
+            return self._load_and_store_template(template_name, cache_key,
+                                                 site, sites__in=[site.id])
+        except (Template.MultipleObjectsReturned, Template.DoesNotExist):
+            try:
+                return self._load_and_store_template(template_name, cache_key,
+                                                     site, sites__isnull=True)
+            except (Template.MultipleObjectsReturned, Template.DoesNotExist):
+                pass
 
-        is_usable = True
-
-        def load_template_source(self, template_name, template_dirs=None):
-            return load_template_source(
-                template_name, template_dirs, annoy=False)
+        # Mark as not-found in cache.
+        cache.set(cache_notfound_key, '1')
+        raise TemplateDoesNotExist(template_name)

dbtemplates/locale/da/LC_MESSAGES/django.po

@@ -1,15 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Michael Lind Mortensen <illio@cs.au.dk>, 2009.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-09 13:45+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,72 +16,93 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
 msgstr ""
-"Hvis du efterlader dette felt tomt, så vil Django søge efter en template med "
-"det givne navn og udfylde dette felt med dets indhold."
+"Hvis du efterlader dette felt tomt, så vil Django søge efter en template med"
+" det givne navn og udfylde dette felt med dets indhold."
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr ""
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr "Dato/tid"
 
-#: admin.py:98
+#: admin.py:102
 #, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr ""
 
-#: admin.py:111
+#: admin.py:114
 #, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr ""
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr "websider"
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "navn"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr "Eksempel: 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr "indhold"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr "oprettelsesdato"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr "sidst ændret"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr "skabelon"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr "skabeloner"
+
+

dbtemplates/locale/de/LC_MESSAGES/django.po

@@ -1,19 +1,23 @@
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Jannis Leidel <jannis@leidel.info>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-07 00:01+0100\n"
-"PO-Revision-Date: 2008-08-19 17:11+0100\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Jannis Leidel <jannis@leidel.info>\n"
+"Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
@@ -21,66 +25,86 @@ msgstr ""
 "Wenn Sie dieses Feld leer lassen, wird Django versuchen, das Template mit "
 "dem angegebenen Namen zu finden und mit dessen Inhalt das Feld zu füllen."
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr "Erweiterte Einstellungen"
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr "Datum/Uhrzeit"
 
-#: admin.py:98
+#: admin.py:102
 #, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] "Der Cache eines Templates wurde erfolgreich geleert."
 msgstr[1] "Der Cache von %(count)d Templates wurde erfolgreich geleert."
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr "Cache der ausgewählten Templates leeren"
 
-#: admin.py:111
+#: admin.py:114
 #, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
-msgstr[0] ""
-"Der Cache eines Templates wurde erfolgreich geleert und neu gefüllt."
+msgstr[0] "Der Cache eines Templates wurde erfolgreich geleert und neu gefüllt."
 msgstr[1] ""
 "Der Cache von %(count)d Templates wurde erfolgreich geleert und neu gefüllt."
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr "Cache der ausgewählten Templates neu füllen"
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] "Template-Syntax von %(names)s ist FEHLERHAFT."
+msgstr[1] "Template-Syntax von %(count)d Templates (%(names)s) ist FEHLERHAFT."
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] "Template-Syntax ist OK."
+msgstr[1] "Template-Syntax von %(count)d Templates ist OK."
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr "Template-Syntax überprüfen"
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr "Seiten"
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "Name"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr "Zum Beispiel: 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr "Inhalt"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr "Erstellt"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr "Geändert"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr "Template"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr "Templates"
+
+

dbtemplates/locale/en/LC_MESSAGES/django.po

@@ -8,78 +8,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-07 00:02+0100\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
 msgstr ""
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr ""
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr ""
 
-#: admin.py:98
+#: admin.py:102
 #, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr ""
 
-#: admin.py:111
+#: admin.py:114
 #, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr ""
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural "Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr ""
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr ""
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr ""
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr ""
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr ""
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr ""
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr ""
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr ""

dbtemplates/locale/fi/LC_MESSAGES/django.po

@@ -1,15 +1,15 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
+# Ville Säävuori <ville@syneus.fi>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: Jaakko Holster <holster@iki.fi>\n"
-"POT-Creation-Date: 2011-01-31 11:10+0100\n"
-"PO-Revision-Date: 2011-01-31 10:08+0000\n"
+"Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,72 +17,93 @@ msgstr ""
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
 msgstr ""
-"Mikäli kenttä on tyhjä, Django etsii samannimistä sivupohjaa ja täyttää "
-"kentän sen sisällöllä."
+"Jos tämä jätetään tyhjäksi, Django etsiin annetulla nimellä olevan "
+"mallipohjan ja täyttää tähän kenttään sen sisällön."
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr "Päiväys/aika"
 
-#: admin.py:98
+#: admin.py:102
 #, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
-msgstr[0] "Sivupohja poistettu välimuistista."
-msgstr[1] "%(count)d sivupohjaa poistettu välimuistista."
+msgstr[0] "Yhden mallipohjan välimuisti on onnistuneesti tyhjennetty."
+msgstr[1] "%(count)d mallipohjan välimusti on onnistuneesti tyhjennetty."
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
-msgstr "Poista valitut sivupohjat välimuistista."
+msgstr "Tyhjennä valittujen mallipohjien välimuisti."
 
-#: admin.py:111
+#: admin.py:114
 #, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
-msgstr[0] "Sivupohja lisätty välimuistiin."
-msgstr[1] "%(count)d sivupohjaa lisätty välimuistiin."
+msgstr[0] "Yhden mallipohjan välimuisti on täytetty onnistuneesti."
+msgstr[1] "%(count)d mallipohjan välimuisti on täytetty onnistuneesti."
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
-msgstr "Lisää valitut sivupohjat välimuistiin."
+msgstr "Täytä valittujen mallipohjien välimuisti."
 
-#: admin.py:119
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr "sivustot"
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "nimi"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
-msgstr "Esimerkki: 'flatpages/default.html'"
+msgstr "Esimerkiksi: 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
-msgstr "sisältö"
+msgstr "sisätö"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
-msgstr "luotu"
+msgstr "luontipäivä"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
-msgstr "muokattu"
+msgstr "viimeksi muutettu"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
-msgstr "sivupohja"
+msgstr "mallipohja"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
-msgstr "sivupohjat"
+msgstr "mallipohjat"
+
+

dbtemplates/locale/fr/LC_MESSAGES/django.po

@@ -1,21 +1,22 @@
-# Roland Frédéric <frederic.roland@creativeconvergence.be>, 2009.
-# 
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: David Paccoud <dpaccoud@gmail.com>\n"
-"Language-Team: French\n"
-"POT-Creation-Date: 2011-01-31 11:10+0100\n"
-"PO-Revision-Date: 2011-01-31 10:08+0000\n"
+"Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
@@ -23,64 +24,85 @@ msgstr ""
 "Si vous laissez ceci vide , Django recherchera un modèle avec le nom donné "
 "et remplira ce champ avec son contenu."
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr ""
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr "Date/heure"
 
-#: admin.py:98
-#, python-format
+#: admin.py:102
+#, fuzzy, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] "Le cache d'un modèle a été invalidé avec succès."
 msgstr[1] ""
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr "Invalidation du cache des modèles sélectionnés"
 
-#: admin.py:111
-#, python-format
+#: admin.py:114
+#, fuzzy, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
 msgstr[0] "Le cache d'un modèle a été rechargé avec succès."
 msgstr[1] ""
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr "Rechargement du cache des modèles sélectionnés"
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr "sites"
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "nom"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr "Exemple : 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr "contenu"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr "date de création"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr "dernier changement"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr "modèle"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr "modèles"
+
+

dbtemplates/locale/he/LC_MESSAGES/django.po

@@ -1,86 +1,106 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"POT-Creation-Date: 2011-01-31 11:10+0100\n"
-"PO-Revision-Date: 2011-01-31 10:08+0000\n"
+"Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
 msgstr "אם זה ריק אז ג'נגו מחפש תבנית עם שם סיפק וממלא את השדה עם תוכנו"
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr ""
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr "תאריך / זמן"
 
-#: admin.py:98
+#: admin.py:102
 #, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr ""
 
-#: admin.py:111
+#: admin.py:114
 #, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr ""
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr "אתרים"
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "שם"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr "דוגמא: 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr "תוכן"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr "נוצר ב"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr "שונה ב"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr "תבנית"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr "תבניות"
+
+

dbtemplates/locale/it/LC_MESSAGES/django.po

@@ -1,18 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: Marco Beri <marcoberi@gmail.com>\n"
-"Language-Team: Jannis Leidel <jannis@leidel.info>\n"
-"POT-Creation-Date: 2011-01-31 11:10+0100\n"
-"PO-Revision-Date: 2011-01-31 10:08+0000\n"
+"Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
@@ -20,64 +24,85 @@ msgstr ""
 "Lasciandolo vuoto, Django cercherà un template con lo stesso nome che avete "
 "indicato sopra e userà il suo contenuto per riempire questo campo."
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr ""
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr ""
 
-#: admin.py:98
+#: admin.py:102
 #, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr ""
 
-#: admin.py:111
+#: admin.py:114
 #, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr ""
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr ""
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "nome"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr "Esempio: 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr "contenuto"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr "data di creazione"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr "ultimo cambiamento"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr "template"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr "template"
+
+

dbtemplates/locale/pt_BR/LC_MESSAGES/django.po

@@ -1,23 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
+# Herson Hersonls <hersonls@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: Diego Búrigo Zacarão <diegobz@fedoraproject.org>\n"
-"Language-Team: Brazilian Portuguese <fedora-trans-pt_br@redhat.com>\n"
-"POT-Creation-Date: 2011-01-31 11:10+0100\n"
-"PO-Revision-Date: 2011-01-31 10:08+0000\n"
+"Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/django-dbtemplates/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
@@ -25,64 +25,85 @@ msgstr ""
 "Manter isto vazio faz com que o Django procure por um modelo (template) com "
 "o dado nome e preencha este campo com o seu conteúdo"
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
-msgstr ""
+msgstr "Avançado"
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr "Data/hora"
 
-#: admin.py:98
+#: admin.py:102
 #, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr ""
 
-#: admin.py:111
+#: admin.py:114
 #, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr ""
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr "sites"
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "Name"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr "Exemplo: 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr "conteúdo"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr "Data de criação"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr "ultima modificação"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr "modelo"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr "modelos"
+
+

dbtemplates/locale/ru/LC_MESSAGES/django.po

@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-30 14:03+0600\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: admin.py:57
+msgid ""
+"Leaving this empty causes Django to look for a template with the given name "
+"and populate this field with its content."
+msgstr "Если вы оставите это поле незаполненным, Django будет искать шаблон с введённым именем и заполнит поле его содержимым."
+
+#: admin.py:92
+msgid "Advanced"
+msgstr "Дополнительно"
+
+#: admin.py:95
+msgid "Date/time"
+msgstr "Дата/время"
+
+#: admin.py:112
+#, python-format
+msgid "Cache of one template successfully invalidated."
+msgid_plural "Cache of %(count)d templates successfully invalidated."
+msgstr[0] "Кэш для шаблона успешно очищен."
+msgstr[1] "Кэш для шаблонов (%(count)d шт.) успешно очищен."
+
+#: admin.py:116
+msgid "Invalidate cache of selected templates"
+msgstr "Очистить кэш для выделенных шаблонов"
+
+#: admin.py:124
+#, python-format
+msgid "Cache successfully repopulated with one template."
+msgid_plural "Cache successfully repopulated with %(count)d templates."
+msgstr[0] "Кэш для шаблона успешно заполнен."
+msgstr[1] "Кэш для шаблонов (%(count)d шт.) успешно заполнен."
+
+#: admin.py:128
+msgid "Repopulate cache with selected templates"
+msgstr "Заполнить кэш для выделенных шаблонов"
+
+#: admin.py:140
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural "Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] "Неверный синтаксис у шаблона %(names)s."
+msgstr[1] "Неверный синтаксис у следующих шаблонов: %(names)s."
+
+#: admin.py:148
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] "Синтаксис шаблона корректен."
+msgstr[1] "Синтаксис шаблонов корректен."
+
+#: admin.py:151
+msgid "Check template syntax"
+msgstr "Проверить синтаксис шаблона"
+
+#: admin.py:155 models.py:29
+msgid "sites"
+msgstr "сайты"
+
+#: models.py:26
+msgid "name"
+msgstr "название"
+
+#: models.py:27
+msgid "Example: 'flatpages/default.html'"
+msgstr "Например: 'flatpages/default.html'"
+
+#: models.py:28
+msgid "content"
+msgstr "содержимое"
+
+#: models.py:31
+msgid "creation date"
+msgstr "дата создания"
+
+#: models.py:33
+msgid "last changed"
+msgstr "последнее изменение"
+
+#: models.py:41
+msgid "template"
+msgstr "шаблон"
+
+#: models.py:42
+msgid "templates"
+msgstr "шаблоны"

dbtemplates/locale/zh_CN/LC_MESSAGES/django.po

@@ -1,15 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: django-dbtemplates\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: 张昆 <zhangkun@web916.com>\n"
-"POT-Creation-Date: 2011-01-31 11:10+0100\n"
-"PO-Revision-Date: 2011-01-31 10:08+0000\n"
+"Report-Msgid-Bugs-To: https://github.com/jezdez/django-dbtemplates/issues\n"
+"POT-Creation-Date: 2011-08-15 13:13+0200\n"
+"PO-Revision-Date: 2011-08-15 11:14+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,68 +16,87 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: admin.py:53
+#: admin.py:56
 msgid ""
 "Leaving this empty causes Django to look for a template with the given name "
 "and populate this field with its content."
 msgstr "此项目留空将使系统用指定的名称寻找模板并应用到该项目。"
 
-#: admin.py:77
+#: admin.py:82
 msgid "Advanced"
 msgstr ""
 
-#: admin.py:80
+#: admin.py:85
 msgid "Date/time"
 msgstr "日期/时间"
 
-#: admin.py:98
-#, python-format
+#: admin.py:102
+#, fuzzy, python-format
 msgid "Cache of one template successfully invalidated."
 msgid_plural "Cache of %(count)d templates successfully invalidated."
 msgstr[0] "该模板的缓存已经成功撤销。"
 
-#: admin.py:102
+#: admin.py:106
 msgid "Invalidate cache of selected templates"
 msgstr "撤销选中模板的缓存"
 
-#: admin.py:111
-#, python-format
+#: admin.py:114
+#, fuzzy, python-format
 msgid "Cache successfully repopulated with one template."
 msgid_plural "Cache successfully repopulated with %(count)d templates."
 msgstr[0] "该模板的缓存已经成功启用。"
 
-#: admin.py:115
+#: admin.py:118
 msgid "Repopulate cache with selected templates"
 msgstr "重新启用选中模板的缓存"
 
-#: admin.py:119 models.py:29
+#: admin.py:130
+#, python-format
+msgid "Template syntax check FAILED for %(names)s."
+msgid_plural ""
+"Template syntax check FAILED for %(count)d templates: %(names)s."
+msgstr[0] ""
+
+#: admin.py:138
+#, python-format
+msgid "Template syntax OK."
+msgid_plural "Template syntax OK for %(count)d templates."
+msgstr[0] ""
+
+#: admin.py:141
+msgid "Check template syntax"
+msgstr ""
+
+#: admin.py:145 models.py:25
 msgid "sites"
 msgstr "站点"
 
-#: models.py:26
+#: models.py:22
 msgid "name"
 msgstr "名称"
 
-#: models.py:27
+#: models.py:23
 msgid "Example: 'flatpages/default.html'"
 msgstr "例如： 'flatpages/default.html'"
 
-#: models.py:28
+#: models.py:24
 msgid "content"
 msgstr "内容"
 
-#: models.py:30
+#: models.py:27
 msgid "creation date"
 msgstr "创建日期"
 
-#: models.py:32
+#: models.py:29
 msgid "last changed"
 msgstr "最新变更"
 
-#: models.py:40
+#: models.py:37
 msgid "template"
 msgstr "模板"
 
-#: models.py:41
+#: models.py:38
 msgid "templates"
 msgstr "模板"
+
+

dbtemplates/management/commands/check_template_syntax.py

@@ -0,0 +1,19 @@
+from django.core.management.base import CommandError, BaseCommand
+
+from dbtemplates.models import Template
+from dbtemplates.utils.template import check_template_syntax
+
+
+class Command(BaseCommand):
+    help = "Ensures templates stored in the database don't have syntax errors."
+
+    def handle(self, **options):
+        errors = []
+        for template in Template.objects.all():
+            valid, error = check_template_syntax(template)
+            if not valid:
+                errors.append(f'{template.name}: {error}')
+        if errors:
+            raise CommandError(
+                'Some templates contained errors\n%s' % '\n'.join(errors))
+        self.stdout.write('OK')

dbtemplates/management/commands/create_error_templates.py

@@ -1,7 +1,5 @@
 import sys
-from optparse import make_option
-
-from django.core.management.base import CommandError, NoArgsCommand
+from django.core.management.base import CommandError, BaseCommand
 from django.contrib.sites.models import Site
 
 from dbtemplates.models import Template
@@ -26,13 +24,15 @@ TEMPLATES = {
 }
 
 
-class Command(NoArgsCommand):
+class Command(BaseCommand):
     help = "Creates the default error templates as database template objects."
-    option_list = NoArgsCommand.option_list + (
-        make_option("-f", "--force", action="store_true", dest="force",
-            default=False, help="overwrite existing database templates"),)
 
-    def handle_noargs(self, **options):
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "-f", "--force", action="store_true", dest="force",
+            default=False, help="overwrite existing database templates")
+
+    def handle(self, **options):
         force = options.get('force')
         try:
             site = Site.objects.get_current()
@@ -43,7 +43,7 @@ class Command(NoArgsCommand):
         verbosity = int(options.get('verbosity', 1))
         for error_code in (404, 500):
             template, created = Template.objects.get_or_create(
-                name="%s.html" % error_code)
+                name=f"{error_code}.html")
             if created or (not created and force):
                 template.content = TEMPLATES.get(error_code, '')
                 template.save()

dbtemplates/management/commands/sync_templates.py

@@ -1,98 +1,153 @@
 import os
-from optparse import make_option
-
-from django.conf import settings
-from django.contrib.sites.models import Site
-from django.core.management.base import CommandError, NoArgsCommand
-from django.template.loaders.app_directories import app_template_dirs
 
 from dbtemplates.models import Template
+from django.contrib.sites.models import Site
+from django.core.management.base import BaseCommand, CommandError
+from django.template.loader import _engine_list
+from django.template.utils import get_app_template_dirs
 
-ALWAYS_ASK, FILES_TO_DATABASE, DATABASE_TO_FILES = ('0', '1', '2')
+ALWAYS_ASK, FILES_TO_DATABASE, DATABASE_TO_FILES = ("0", "1", "2")
 
-class Command(NoArgsCommand):
+DIRS = []
+for engine in _engine_list():
+    DIRS.extend(engine.dirs)
+DIRS = tuple(DIRS)
+app_template_dirs = get_app_template_dirs("templates")
+
+
+class Command(BaseCommand):
     help = "Syncs file system templates with the database bidirectionally."
-    option_list = NoArgsCommand.option_list + (
-        make_option("-e", "--ext", dest="ext", action="store", default="html",
-            help="extension of the files you want to sync with the database "
-                 "[default: %default]"),
-        make_option("-f", "--force", action="store_true", dest="force",
-            default=False, help="overwrite existing database templates"),
-        make_option("-o", "--overwrite", action="store", dest="overwrite",
-            default='0', help="'0' - ask always, '1' - overwrite database "
-                "templates from template files, '2' - overwrite template "
-                "files from database templates"),
-        make_option("-a", "--app-first", action="store_true", dest="app_first",
-            default=False, help="look for templates in applications "
-                                "directories before project templates"))
 
-    def handle_noargs(self, **options):
-        extension = options.get('ext')
-        force = options.get('force')
-        overwrite = options.get('overwrite')
-        app_first = options.get('app_first')
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "-e",
+            "--ext",
+            dest="ext",
+            action="store",
+            default="html",
+            help="extension of the files you want to "
+            "sync with the database [default: %(default)s]",
+        )
+        parser.add_argument(
+            "-f",
+            "--force",
+            action="store_true",
+            dest="force",
+            default=False,
+            help="overwrite existing database templates",
+        )
+        parser.add_argument(
+            "-o",
+            "--overwrite",
+            action="store",
+            dest="overwrite",
+            default="0",
+            help="'0' - ask always, '1' - overwrite database "
+            "templates from template files, '2' - overwrite "
+            "template files from database templates",
+        )
+        parser.add_argument(
+            "-a",
+            "--app-first",
+            action="store_true",
+            dest="app_first",
+            default=False,
+            help="look for templates in applications "
+            "directories before project templates",
+        )
+        parser.add_argument(
+            "-d",
+            "--delete",
+            action="store_true",
+            dest="delete",
+            default=False,
+            help="Delete templates after syncing",
+        )
+
+    def handle(self, **options):
+        extension = options.get("ext")
+        force = options.get("force")
+        overwrite = options.get("overwrite")
+        app_first = options.get("app_first")
+        delete = options.get("delete")
 
         if not extension.startswith("."):
-            extension = ".%s" % extension
+            extension = f".{extension}"
 
         try:
             site = Site.objects.get_current()
-        except:
-            raise CommandError("Please make sure to have the sites contrib "
-                               "app installed and setup with a site object")
-
-        if not type(settings.TEMPLATE_DIRS) in (tuple, list):
-            raise CommandError("Please make sure settings.TEMPLATE_DIRS is a "
-                               "list or tuple.")
+        except Exception:
+            raise CommandError(
+                "Please make sure to have the sites contrib "
+                "app installed and setup with a site object"
+            )
 
         if app_first:
-            tpl_dirs = app_template_dirs + settings.TEMPLATE_DIRS
+            tpl_dirs = app_template_dirs + DIRS
         else:
-            tpl_dirs = settings.TEMPLATE_DIRS + app_template_dirs
-        templatedirs = [d for d in tpl_dirs if os.path.isdir(d)]
+            tpl_dirs = DIRS + app_template_dirs
+        templatedirs = [str(d) for d in tpl_dirs if os.path.isdir(d)]
 
         for templatedir in templatedirs:
             for dirpath, subdirs, filenames in os.walk(templatedir):
-                for f in [f for f in filenames if f.endswith(extension)
-                    and not f.startswith(".")]:
+                for f in [
+                    f
+                    for f in filenames
+                    if f.endswith(extension) and not f.startswith(".")
+                ]:
                     path = os.path.join(dirpath, f)
-                    name = path.split(templatedir)[1][1:]
+                    name = path.split(str(templatedir))[1]
+                    if name.startswith("/"):
+                        name = name[1:]
                     try:
                         t = Template.on_site.get(name__exact=name)
                     except Template.DoesNotExist:
                         if not force:
-                            confirm = raw_input(
+                            confirm = input(
                                 "\nA '%s' template doesn't exist in the "
                                 "database.\nCreate it with '%s'?"
-                                    " (y/[n]): """ % (name, path))
-                        if force or confirm.lower().startswith('y'):
-                            t = Template(name=name,
-                                content=open(path, "r").read())
+                                " (y/[n]): "
+                                "" % (name, path)
+                            )
+                        if force or confirm.lower().startswith("y"):
+                            with open(path, encoding="utf-8") as f:
+                                t = Template(name=name, content=f.read())
                             t.save()
                             t.sites.add(site)
                     else:
-                        while 1:
+                        while True:
                             if overwrite == ALWAYS_ASK:
-                                confirm = raw_input(
-                                    "\n%s exists in the database.\n"
-                                    "(1) Overwrite %s with '%s'\n"
-                                    "(2) Overwrite '%s' with %s\n"
+                                _i = (
+                                    "\n%(template)s exists in the database.\n"
+                                    "(1) Overwrite %(template)s with '%(path)s'\n"  # noqa
+                                    "(2) Overwrite '%(path)s' with %(template)s\n"  # noqa
                                     "Type 1 or 2 or press <Enter> to skip: "
-                                        % (t.__repr__(),
-                                           t.__repr__(), path,
-                                           path, t.__repr__()))
+                                    % {"template": t.__repr__(), "path": path}
+                                )
+
+                                confirm = input(_i)
                             else:
                                 confirm = overwrite
-                            if confirm == '' or confirm in (
-                                    FILES_TO_DATABASE, DATABASE_TO_FILES):
+                            if confirm in (
+                                "",
+                                FILES_TO_DATABASE,
+                                DATABASE_TO_FILES,
+                            ):
                                 if confirm == FILES_TO_DATABASE:
-                                    t.content = open(path, 'r').read()
-                                    t.save()
-                                    t.sites.add(site)
+                                    with open(path, encoding="utf-8") as f:
+                                        t.content = f.read()
+                                        t.save()
+                                        t.sites.add(site)
+                                    if delete:
+                                        try:
+                                            os.remove(path)
+                                        except OSError:
+                                            raise CommandError(
+                                                f"Couldn't delete {path}"
+                                            )
                                 elif confirm == DATABASE_TO_FILES:
-                                    try:
-                                        f = open(path, 'w')
+                                    with open(path, "w", encoding="utf-8") as f:  # noqa
                                         f.write(t.content)
-                                    finally:
-                                        f.close()
+                                    if delete:
+                                        t.delete()
                                 break

dbtemplates/migrations/0001_initial.py

@@ -0,0 +1,73 @@
+import django
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("sites", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Template",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                (
+                    "name",
+                    models.CharField(
+                        help_text="Example: 'flatpages/default.html'",
+                        max_length=100,
+                        verbose_name="name",
+                    ),
+                ),
+                (
+                    "content",
+                    models.TextField(verbose_name="content", blank=True),
+                ),  # noqa
+                (
+                    "creation_date",
+                    models.DateTimeField(
+                        default=django.utils.timezone.now,
+                        verbose_name="creation date",  # noqa
+                    ),
+                ),
+                (
+                    "last_changed",
+                    models.DateTimeField(
+                        default=django.utils.timezone.now,
+                        verbose_name="last changed",  # noqa
+                    ),
+                ),
+                (
+                    "sites",
+                    models.ManyToManyField(
+                        to="sites.Site", verbose_name="sites", blank=True
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ("name",),
+                "db_table": "django_template",
+                "verbose_name": "template",
+                "verbose_name_plural": "templates",
+            },
+            bases=(models.Model,),
+            managers=[
+                ("objects", django.db.models.manager.Manager()),
+                (
+                    "on_site",
+                    django.contrib.sites.managers.CurrentSiteManager("sites"),
+                ),  # noqa
+            ],
+        ),
+    ]

dbtemplates/migrations/0002_alter_template_creation_date_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1 on 2025-05-26 19:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dbtemplates', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='template',
+            name='creation_date',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='creation date'),
+        ),
+        migrations.AlterField(
+            model_name='template',
+            name='last_changed',
+            field=models.DateTimeField(auto_now=True, verbose_name='last changed'),
+        ),
+    ]

dbtemplates/models.py

@@ -1,32 +1,32 @@
-# -*- coding: utf-8 -*-
-from datetime import datetime
+from dbtemplates.conf import settings
+from dbtemplates.utils.cache import (
+    add_template_to_cache,
+    remove_cached_template,
+)
+from dbtemplates.utils.template import get_template_source
 
+from django.contrib.sites.managers import CurrentSiteManager
+from django.contrib.sites.models import Site
 from django.db import models
 from django.db.models import signals
 from django.template import TemplateDoesNotExist
 from django.utils.translation import gettext_lazy as _
 
-from django.contrib.sites.models import Site
-from django.contrib.sites.managers import CurrentSiteManager
-
-from dbtemplates import settings
-from dbtemplates.utils import (add_default_site, add_template_to_cache,
-    remove_cached_template, get_template_source)
-
 
 class Template(models.Model):
     """
     Defines a template model for use with the database template loader.
     The field ``name`` is the equivalent to the filename of a static template.
     """
-    name = models.CharField(_('name'), unique=True, max_length=100,
+    id = models.AutoField(primary_key=True, verbose_name=_('ID'),
+                          serialize=False, auto_created=True)
+    name = models.CharField(_('name'), max_length=100,
                             help_text=_("Example: 'flatpages/default.html'"))
     content = models.TextField(_('content'), blank=True)
-    sites = models.ManyToManyField(Site, verbose_name=_('sites'))
-    creation_date = models.DateTimeField(_('creation date'),
-                                         default=datetime.now)
-    last_changed = models.DateTimeField(_('last changed'),
-                                        default=datetime.now)
+    sites = models.ManyToManyField(Site, verbose_name=_('sites'),
+                                   blank=True)
+    creation_date = models.DateTimeField(_('creation date'), auto_now_add=True)
+    last_changed = models.DateTimeField(_('last changed'), auto_now=True)
 
     objects = models.Manager()
     on_site = CurrentSiteManager('sites')
@@ -37,7 +37,7 @@ class Template(models.Model):
         verbose_name_plural = _('templates')
         ordering = ('name',)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     def populate(self, name=None):
@@ -55,12 +55,24 @@ class Template(models.Model):
             pass
 
     def save(self, *args, **kwargs):
-        self.last_changed = datetime.now()
         # If content is empty look for a template with the given name and
         # populate the template instance with its content.
-        if settings.AUTO_POPULATE_CONTENT and not self.content:
+        if settings.DBTEMPLATES_AUTO_POPULATE_CONTENT and not self.content:
             self.populate()
-        super(Template, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
+
+
+def add_default_site(instance, **kwargs):
+    """
+    Called via Django's signals to cache the templates, if the template
+    in the database was added or changed, only if
+    DBTEMPLATES_ADD_DEFAULT_SITE setting is set.
+    """
+    if not settings.DBTEMPLATES_ADD_DEFAULT_SITE:
+        return
+    current_site = Site.objects.get_current()
+    if current_site not in instance.sites.all():
+        instance.sites.add(current_site)
 
 
 signals.post_save.connect(add_default_site, sender=Template)

dbtemplates/settings.py

@@ -1,36 +0,0 @@
-import posixpath
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-
-if "dbtemplates" in getattr(settings, "CACHES", {}):
-    # If we are on Django 1.3 AND using the new CACHES setting..
-    cache = "dbtemplates"
-else:
-    # ..or fall back to the old CACHE_BACKEND setting
-    cache = getattr(settings, "DBTEMPLATES_CACHE_BACKEND", None)
-if not cache:
-    raise ImproperlyConfigured("Please specify a dbtemplates "
-                               "cache backend in your settings.")
-elif isinstance(cache, basestring) and cache.startswith("dbtemplates."):
-    raise ImproperlyConfigured("Please upgrade to one of the supported "
-                               "backends as defined in the Django docs.")
-CACHE_BACKEND = cache
-
-ADD_DEFAULT_SITE = getattr(settings, 'DBTEMPLATES_ADD_DEFAULT_SITE', True)
-
-AUTO_POPULATE_CONTENT = getattr(
-    settings, 'DBTEMPLATES_AUTO_POPULATE_CONTENT', True)
-
-base_url = getattr(settings, "STATIC_URL", None)
-if base_url is None:
-    base_url = settings.MEDIA_URL
-MEDIA_PREFIX = getattr(settings, 'DBTEMPLATES_MEDIA_PREFIX',
-                       posixpath.join(base_url, "dbtemplates/"))
-
-USE_REVERSION = getattr(settings, 'DBTEMPLATES_USE_REVERSION', False)
-
-if USE_REVERSION and 'reversion'not in settings.INSTALLED_APPS:
-    raise ImproperlyConfigured("Please add reversion to your "
-        "INSTALLED_APPS setting to make use of it in dbtemplates.")
-
-USE_CODEMIRROR = getattr(settings, 'DBTEMPLATES_USE_CODEMIRROR', False)

dbtemplates/test_cases.py

@@ -0,0 +1,175 @@
+import os
+import shutil
+import tempfile
+from unittest import mock
+
+from django.conf import settings as django_settings
+from django.core.cache.backends.base import BaseCache
+from django.core.management import call_command
+from django.template import loader, TemplateDoesNotExist
+from django.test import TestCase
+
+from django.contrib.sites.models import Site
+
+from dbtemplates.conf import settings
+from dbtemplates.models import Template
+from dbtemplates.utils.cache import get_cache_backend, get_cache_key
+from dbtemplates.utils.template import (get_template_source,
+                                        check_template_syntax)
+from dbtemplates.management.commands.sync_templates import (FILES_TO_DATABASE,
+                                                            DATABASE_TO_FILES)
+
+
+class DbTemplatesTestCase(TestCase):
+    def setUp(self):
+        self.old_TEMPLATES = settings.TEMPLATES
+        if 'dbtemplates.loader.Loader' not in settings.TEMPLATES:
+            loader.template_source_loaders = None
+            settings.TEMPLATES = list(settings.TEMPLATES) + [
+                'dbtemplates.loader.Loader'
+            ]
+
+        self.site1, created1 = Site.objects.get_or_create(
+            domain="example.com", name="example.com")
+        self.site2, created2 = Site.objects.get_or_create(
+            domain="example.org", name="example.org")
+        self.t1, _ = Template.objects.get_or_create(
+            name='base.html', content='base')
+        self.t2, _ = Template.objects.get_or_create(
+            name='sub.html', content='sub')
+        self.t2.sites.add(self.site2)
+
+    def tearDown(self):
+        loader.template_source_loaders = None
+        settings.TEMPLATES = self.old_TEMPLATES
+
+    def test_basics(self):
+        self.assertEqual(list(self.t1.sites.all()), [self.site1])
+        self.assertTrue("base" in self.t1.content)
+        self.assertEqual(list(Template.objects.filter(sites=self.site1)),
+                         [self.t1, self.t2])
+        self.assertEqual(list(self.t2.sites.all()), [self.site1, self.site2])
+
+    def test_empty_sites(self):
+        old_add_default_site = settings.DBTEMPLATES_ADD_DEFAULT_SITE
+        try:
+            settings.DBTEMPLATES_ADD_DEFAULT_SITE = False
+            self.t3 = Template.objects.create(
+                name='footer.html', content='footer')
+            self.assertEqual(list(self.t3.sites.all()), [])
+        finally:
+            settings.DBTEMPLATES_ADD_DEFAULT_SITE = old_add_default_site
+
+    def test_load_templates_sites(self):
+        old_add_default_site = settings.DBTEMPLATES_ADD_DEFAULT_SITE
+        old_site_id = django_settings.SITE_ID
+        try:
+            settings.DBTEMPLATES_ADD_DEFAULT_SITE = False
+            t_site1 = Template.objects.create(
+                name='copyright.html', content='(c) example.com')
+            t_site1.sites.add(self.site1)
+            t_site2 = Template.objects.create(
+                name='copyright.html', content='(c) example.org')
+            t_site2.sites.add(self.site2)
+
+            django_settings.SITE_ID = Site.objects.create(
+                domain="example.net", name="example.net").id
+            Site.objects.clear_cache()
+
+            self.assertRaises(TemplateDoesNotExist,
+                              loader.get_template, "copyright.html")
+        finally:
+            django_settings.SITE_ID = old_site_id
+            settings.DBTEMPLATES_ADD_DEFAULT_SITE = old_add_default_site
+
+    def test_load_templates(self):
+        result = loader.get_template("base.html").render()
+        self.assertEqual(result, 'base')
+        result2 = loader.get_template("sub.html").render()
+        self.assertEqual(result2, 'sub')
+
+    def test_error_templates_creation(self):
+        call_command('create_error_templates', force=True, verbosity=0)
+        self.assertEqual(list(Template.objects.filter(sites=self.site1)),
+                         list(Template.objects.filter()))
+        self.assertTrue(Template.objects.filter(name='404.html').exists())
+
+    def test_automatic_sync(self):
+        admin_base_template = get_template_source('admin/base.html')
+        template = Template.objects.create(name='admin/base.html')
+        self.assertEqual(admin_base_template, template.content)
+
+    def test_sync_templates(self):
+        old_template_dirs = settings.TEMPLATES[0].get('DIRS', [])
+        temp_template_dir = tempfile.mkdtemp('dbtemplates')
+        temp_template_path = os.path.join(temp_template_dir, 'temp_test.html')
+        temp_template = open(temp_template_path, 'w', encoding='utf-8')
+        try:
+            temp_template.write('temp test')
+            settings.TEMPLATES[0]['DIRS'] = (temp_template_dir,)
+            # these works well if is not settings patched at runtime
+            # for supporting django < 1.7 tests we must patch dirs in runtime
+            from dbtemplates.management.commands import sync_templates
+            sync_templates.DIRS = settings.TEMPLATES[0]['DIRS']
+
+            self.assertFalse(
+                Template.objects.filter(name='temp_test.html').exists())
+            call_command('sync_templates', force=True,
+                         verbosity=0, overwrite=FILES_TO_DATABASE)
+            self.assertTrue(
+                Template.objects.filter(name='temp_test.html').exists())
+
+            t = Template.objects.get(name='temp_test.html')
+            t.content = 'temp test modified'
+            t.save()
+            call_command('sync_templates', force=True,
+                         verbosity=0, overwrite=DATABASE_TO_FILES)
+            self.assertEqual('temp test modified',
+                             open(temp_template_path,
+                                  encoding='utf-8').read())
+
+            call_command('sync_templates', force=True, verbosity=0,
+                         delete=True, overwrite=DATABASE_TO_FILES)
+            self.assertTrue(os.path.exists(temp_template_path))
+            self.assertFalse(
+                Template.objects.filter(name='temp_test.html').exists())
+        finally:
+            temp_template.close()
+            settings.TEMPLATES[0]['DIRS'] = old_template_dirs
+            shutil.rmtree(temp_template_dir)
+
+    def test_get_cache(self):
+        self.assertTrue(isinstance(get_cache_backend(), BaseCache))
+
+    def test_check_template_syntax(self):
+        bad_template, _ = Template.objects.get_or_create(
+            name='bad.html', content='{% if foo %}Bar')
+        good_template, _ = Template.objects.get_or_create(
+            name='good.html', content='{% if foo %}Bar{% endif %}')
+        self.assertFalse(check_template_syntax(bad_template)[0])
+        self.assertTrue(check_template_syntax(good_template)[0])
+
+    def test_get_cache_name(self):
+        self.assertEqual(get_cache_key('name with spaces'),
+                         'dbtemplates::name-with-spaces::1')
+
+    def test_cache_invalidation(self):
+        # Add t1 into the cache of site2
+        self.t1.sites.add(self.site2)
+        with mock.patch('django.contrib.sites.models.SiteManager.get_current',
+                        return_value=self.site2):
+            result = loader.get_template("base.html").render()
+            self.assertEqual(result, 'base')
+
+        # Update content
+        self.t1.content = 'new content'
+        self.t1.save()
+        result = loader.get_template("base.html").render()
+        self.assertEqual(result, 'new content')
+
+        # Cache invalidation should work across sites.
+        # Site2 should see the new content.
+        with mock.patch('django.contrib.sites.models.SiteManager.get_current',
+                        return_value=self.site2):
+            result = loader.get_template("base.html").render()
+            self.assertEqual(result, 'new content')

dbtemplates/test_settings.py

@@ -0,0 +1,51 @@
+DBTEMPLATES_CACHE_BACKEND = 'dummy://'
+
+DATABASE_ENGINE = 'sqlite3'
+# SQLite does not support removing unique constraints (see #28)
+SOUTH_TESTS_MIGRATE = False
+
+SITE_ID = 1
+
+SECRET_KEY = 'something-something'
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': ':memory:',
+    }
+}
+
+INSTALLED_APPS = [
+    'django.contrib.contenttypes',
+    'django.contrib.sites',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'dbtemplates',
+]
+
+MIDDLEWARE = (
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+)
+
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
+    'dbtemplates.loader.Loader',
+)
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'OPTIONS': {
+            'loaders': TEMPLATE_LOADERS,
+            'context_processors': [
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ]
+        }
+    },
+]

dbtemplates/tests.py

@@ -1,66 +0,0 @@
-from django import VERSION
-from django.core.management import call_command
-from django.template import loader, Context
-from django.test import TestCase
-
-from django.contrib.sites.models import Site
-
-from dbtemplates import settings
-from dbtemplates.loader import load_template_source
-from dbtemplates.models import Template, get_template_source
-
-class DbTemplatesTestCase(TestCase):
-    def setUp(self):
-        self.site1, created1 = Site.objects.get_or_create(domain="example.com", name="example.com")
-        self.site2, created2 = Site.objects.get_or_create(domain="example.org", name="example.org")
-
-    def test_basiscs(self):
-        t1 = Template(name='base.html', content='<html><head></head><body>{% block content %}Welcome at {{ title }}{% endblock %}</body></html>')
-        t1.save()
-        self.assertEqual(Site.objects.get_current(), t1.sites.all()[0])
-        self.assertTrue("Welcome at" in t1.content)
-
-        t2 = Template(name='sub.html', content='{% extends "base.html" %}{% block content %}This is {{ title }}{% endblock %}')
-        t2.save()
-        t2.sites.add(self.site2)
-
-        self.assertEqual(list(Template.objects.filter(sites=self.site1)), [t1, t2])
-        self.assertEqual(list(t2.sites.all()), [self.site1, self.site2])
-
-    def test_load_templates(self):
-        self.test_basiscs()
-        original_template_source_loaders = loader.template_source_loaders
-        loader.template_source_loaders = [load_template_source]
-        try:
-            result1 = loader.get_template("base.html").render(Context({'title':'MainPage'}))
-            self.assertEqual(result1, u'<html><head></head><body>Welcome at MainPage</body></html>')
-            result2 = loader.get_template("sub.html").render(Context({'title':'SubPage'}))
-            self.assertEqual(result2, u'<html><head></head><body>This is SubPage</body></html>')
-
-            if VERSION[:2] >= (1, 2):
-                from dbtemplates.loader import Loader
-                dbloader = Loader()
-                loader.template_source_loaders = [dbloader.load_template_source]
-                result = loader.get_template("base.html").render(Context({'title':'MainPage'}))
-                self.assertEqual(result, u'<html><head></head><body>Welcome at MainPage</body></html>')
-                result2 = loader.get_template("sub.html").render(Context({'title':'SubPage'}))
-                self.assertEqual(result2, u'<html><head></head><body>This is SubPage</body></html>')
-        finally:
-            loader.template_source_loaders = original_template_source_loaders
-
-    def test_error_templates_creation(self):
-        call_command('create_error_templates', force=True, verbosity=0)
-        self.assertEqual(list(Template.objects.filter(sites=self.site1)),
-            list(Template.objects.filter()))
-
-    def test_disabling_default_site(self):
-        old_add_default_site = settings.ADD_DEFAULT_SITE
-        settings.ADD_DEFAULT_SITE = False
-        t3 = Template.objects.create(name='footer.html', content='ohai')
-        self.assertEqual(list(t3.sites.all()), [])
-        settings.ADD_DEFAULT_SITE = old_add_default_site
-
-    def test_automatic_sync(self):
-        admin_base_template = get_template_source('admin/base.html')
-        template = Template.objects.create(name='admin/base.html')
-        self.assertEqual(admin_base_template, template.content)

dbtemplates/utils.py

@@ -1,93 +0,0 @@
-from django import VERSION
-from django.core.cache import get_cache
-from django.template import TemplateDoesNotExist
-from django.utils.importlib import import_module
-
-from django.contrib.sites.models import Site
-
-from dbtemplates import settings
-
-
-def get_cache_backend():
-    return get_cache(settings.CACHE_BACKEND)
-
-cache = get_cache_backend()
-
-
-def add_default_site(instance, **kwargs):
-    """
-    Called via Django's signals to cache the templates, if the template
-    in the database was added or changed, only if DBTEMPLATES_ADD_DEFAULT_SITE
-    setting is set.
-    """
-    if settings.ADD_DEFAULT_SITE:
-        current_site = Site.objects.get_current()
-        if current_site not in instance.sites.all():
-            instance.sites.add(current_site)
-
-
-def get_cache_key(name):
-    current_site = Site.objects.get_current()
-    return 'dbtemplates::%s::%s' % (name, current_site.pk)
-
-
-def add_template_to_cache(instance, **kwargs):
-    """
-    Called via Django's signals to cache the templates, if the template
-    in the database was added or changed.
-    """
-    remove_cached_template(instance)
-    cache.set(get_cache_key(instance.name), instance.content)
-
-
-def remove_cached_template(instance, **kwargs):
-    """
-    Called via Django's signals to remove cached templates, if the template
-    in the database was changed or deleted.
-    """
-    cache.delete(get_cache_key(instance.name))
-
-
-def get_loaders():
-    from django.template.loader import template_source_loaders
-    if template_source_loaders is None:
-        try:
-            from django.template.loader import (
-                find_template as finder_func)
-        except ImportError:
-            from django.template.loader import (
-                find_template_source as finder_func)
-        try:
-            source, name = finder_func('test')
-        except TemplateDoesNotExist:
-            pass
-        from django.template.loader import template_source_loaders
-    return template_source_loaders or []
-
-
-def get_template_source(name):
-    source = None
-    for loader in get_loaders():
-        if loader.__module__.startswith('dbtemplates.'):
-            # Don't give a damn about dbtemplates' own loader.
-            continue
-        module = import_module(loader.__module__)
-        load_template_source = getattr(module, 'load_template_source', None)
-        if load_template_source is None:
-            load_template_source = loader.load_template_source
-        try:
-            source, origin = load_template_source(name)
-            if source:
-                return source
-        except TemplateDoesNotExist:
-            pass
-    if source is None and VERSION[:2] < (1, 2):
-        # Django supported template source extraction still :/
-        try:
-            from django.template.loader import find_template_source
-            template, origin = find_template_source(name, None)
-            if not hasattr(template, 'render'):
-                return template
-        except (ImportError, TemplateDoesNotExist):
-            pass
-    return None

dbtemplates/utils/cache.py

@@ -0,0 +1,62 @@
+from dbtemplates.conf import settings
+from django.contrib.sites.models import Site
+from django.core import signals
+from django.template.defaultfilters import slugify
+
+
+def get_cache_backend():
+    """
+    Compatibilty wrapper for getting Django's cache backend instance
+    """
+    from django.core.cache import caches
+    cache = caches.create_connection(settings.DBTEMPLATES_CACHE_BACKEND)
+
+    # Some caches -- python-memcached in particular -- need to do a cleanup at
+    # the end of a request cycle. If not implemented in a particular backend
+    # cache.close is a no-op
+    signals.request_finished.connect(cache.close)
+    return cache
+
+
+cache = get_cache_backend()
+
+
+def get_cache_key(name, site=None):
+    if site is None:
+        site = Site.objects.get_current()
+    return f"dbtemplates::{slugify(name)}::{site.pk}"
+
+
+def get_cache_notfound_key(name):
+    return get_cache_key(name) + "::notfound"
+
+
+def remove_notfound_key(instance):
+    # Remove notfound key as soon as we save the template.
+    cache.delete(get_cache_notfound_key(instance.name))
+
+
+def set_and_return(cache_key, content, display_name):
+    # Save in cache backend explicitly if manually deleted or invalidated
+    if cache:
+        cache.set(cache_key, content)
+    return (content, display_name)
+
+
+def add_template_to_cache(instance, **kwargs):
+    """
+    Called via Django's signals to cache the templates, if the template
+    in the database was added or changed.
+    """
+    remove_cached_template(instance)
+    remove_notfound_key(instance)
+    cache.set(get_cache_key(instance.name), instance.content)
+
+
+def remove_cached_template(instance, **kwargs):
+    """
+    Called via Django's signals to remove cached templates, if the template
+    in the database was changed or deleted.
+    """
+    for site in instance.sites.all():
+        cache.delete(get_cache_key(instance.name, site=site))

dbtemplates/utils/template.py

@@ -0,0 +1,33 @@
+from django.template import (Template, TemplateDoesNotExist,
+                             TemplateSyntaxError)
+
+
+def get_loaders():
+    from django.template.loader import _engine_list
+    loaders = []
+    for engine in _engine_list():
+        loaders.extend(engine.engine.template_loaders)
+    return loaders
+
+
+def get_template_source(name):
+    source = None
+    for loader in get_loaders():
+        if loader.__module__.startswith('dbtemplates.'):
+            # Don't give a damn about dbtemplates' own loader.
+            continue
+        for origin in loader.get_template_sources(name):
+            try:
+                source = loader.get_contents(origin)
+            except (NotImplementedError, TemplateDoesNotExist):
+                continue
+            if source:
+                return source
+
+
+def check_template_syntax(template):
+    try:
+        Template(template.content)
+    except TemplateSyntaxError as e:
+        return (False, e)
+    return (True, None)

docs/advanced.txt

@@ -20,7 +20,7 @@ To enable one of them you need to specify a setting called
 .. note::
     Starting in version 1.0 ``dbtemplates`` allows you also to set the new
     dict-based ``CACHES`` setting, which was introduced in Django 1.3.
-    
+
     All you have to do is to provide a new entry in the ``CACHES`` dict
     named ``'dbtemplates'``, e.g.::
 
@@ -61,8 +61,17 @@ Short installation howto
 3. Sync your database with ``python manage.py syncdb``
 4. Set ``DBTEMPLATES_USE_REVERSION`` setting to ``True``
 
+History compare view
+--------------------
+
+You can also use ``dbtemplates`` together with `django-reversion-compare`_ which
+provides a history compare view to compare two versions of a model which is under
+reversion.
+
 .. _django-reversion: https://github.com/etianen/django-reversion
-.. _django-reversion's documentation: https://github.com/etianen/django-reversion/wiki/getting-started
+.. _django-reversion's documentation: https://django-reversion.readthedocs.io/en/latest/
+.. _django-reversion-compare: https://github.com/jedie/django-reversion-compare
+
 
 .. _commands:
 
@@ -82,6 +91,12 @@ Management commands
   Tries to add the two templates ``404.html`` and ``500.html`` that are used
   by Django when a error occurs.
 
+* ``check_template_syntax``
+
+  .. versionadded:: 1.2
+
+  Checks the saved templates whether they are valid Django templates.
+
 .. _Django management commands: http://docs.djangoproject.com/en/dev/ref/django-admin/
 
 .. _admin_actions:
@@ -101,4 +116,10 @@ Admin actions
   Repopulates the cache with selected templates by invalidating it first and
   filling then after that.
 
+* ``check_syntax``
+
+  .. versionadded:: 1.2
+
+  Checks the selected tempaltes for syntax errors.
+
 .. _admin actions: http://docs.djangoproject.com/en/dev/ref/contrib/admin/actions/

docs/changelog.txt

@@ -1,8 +1,194 @@
 Changelog
 =========
 
-1.0 (04-11-11)
---------------
+v5.0 (unreleased)
+-----------------
+
+.. warning::
+
+  This is a backwards-incompatible release!
+
+* Dropped support for Python 3.7 and Django < 4.2.
+
+* Added support for Python 3.11, 3.12, 3.13.
+
+* Django 5.x support
+
+v4.0 (2022-09-3)
+-----------------
+
+.. warning::
+
+  This is a backwards-incompatible release!
+
+* Dropped support for Python 2.7 and Django < 3.2.
+
+* Added support for Python 3.8, 3.9, 3.10.
+
+* Moved test runner to GitHub Actions:
+
+  http://github.com/jazzband/django-dbtemplates/actions
+
+* Django 4.x support
+
+v3.0 (2019-01-27)
+-----------------
+
+.. warning::
+
+  This is a backwards-incompatible release!
+
+* Dropped support for Django < 1.11.
+
+* Added support for Django 2.0 and 2.1.
+
+* Added support for Python 3.7.
+
+* Recompiled Russian locale.
+
+* Fixed byte string in migration file that caused the migration
+  system to falsely think that there are new changes.
+
+* Fixed string representation of template model, e.g. to improve
+  readability in choice fields.
+
+v2.0 (2016-09-29)
+-----------------
+
+.. warning::
+
+  This is a backwards-incompatible release!
+
+* Moved maintenance to the `Jazzband <https://jazzband.co/>`_
+
+* Dropped support for Python 2.6
+
+* Added support for Python 3.4 and 3.5
+
+* Dropped support for Django < 1.8
+
+* Removed South migrations. Please use Django's native migration system instead
+
+* Removed the example project since it's out-of-date quickly
+
+v1.3.2 (2015-06-15)
+-------------------
+
+* support for Django 1.8 (not full, but usable)
+* support for RedactorJS
+
+thanks for contrib - @eculver, @kmooney, @volksman
+
+v1.3.1 (2012-05-23)
+-------------------
+
+* Minor release to move away from nose again and use own
+  `django-discover-runner`_.
+
+.. _`django-discover-runner`: http://pypi.python.org/pypi/django-discover-runner
+
+v1.3 (2012-05-07)
+-----------------
+
+* Dropped support for Django < 1.3 **backwards incompatible**
+
+* Dropped using versiontools in favor of home made solution.
+
+* Added optional support for TinyMCE editor instead of the CodeMirror
+  editor (just enable ``DBTEMPLATES_USE_TINYMCE``).
+
+* Fixed compatibility to Django 1.4's handling of the ``DATABASES``
+  setting. Should also respect database routers now.
+
+* Fixed an issue of the cache key generation in combination with
+  memcache's inability to stomach spaces.
+
+* Moved test runner to use nose_ and a hosted CI project at Travis_:
+  http://travis-ci.org/jazzband/django-dbtemplates
+
+.. _nose: https://nose.readthedocs.io/
+.. _Travis: http://travis-ci.org
+
+v1.2.1 (2011-09-07)
+-------------------
+
+* Fixed a wrong use of the non-lazy localization tools.
+
+* Fixed bugs in the documentation.
+
+* Make use of django-appconf and versiontools.
+
+v1.2 (2011-08-15)
+-----------------
+
+* Refactored the template loader to be even more cache effective.
+
+* Added ``check_template_syntax`` management command and admin action
+  to make sure the saved templates are valid Django templates.
+
+v1.1.1 (2011-07-08)
+-------------------
+
+* Fixed bug in cache loading (again).
+
+* Fixed bugs in the documentation.
+
+.. note::
+
+    Since ``dbtemplates`` removed support for Django lower than 1.2 you
+    have to use the template loader class in the ``TEMPLATE_LOADERS``
+    (``'dbtemplates.loader.Loader'``) and **not** the previosly included
+    function that ended with ``load_template_source``.
+
+v1.1 (2011-07-06)
+-----------------
+
+* **BACKWARDS-INCOMPATIBLE** Requires Django 1.2 or higher.
+  For previous Django versions use an older versions of ``dbtemplates``,
+  e.g.::
+
+        $ pip install "django-dbtemplates<1.1"
+
+* Added South migrations.
+
+.. note::
+
+    If you are using South in your Django project, you can easily enable
+    dbtemplates' migrations, *faking* the first migration by using the
+    ``--fake`` option of South's ``migrate`` management command::
+
+        $ manage.py migrate --fake 0001 dbtemplates
+
+    Then run the rest of the migrations::
+
+        $ manage.py migrate dbtemplates
+
+* Removed uniqueness on the ``name`` field of the ``Template`` model. This is
+  needed because there isn't a ``unique_together`` for M2M fields in Django
+  such as the ``sites`` field in the ``Template`` model.
+
+* Made the ``sites`` field optional to support a way to apply a template to
+  all sites.
+
+* Added ``--delete`` option to ``sync_templates`` managment command to delete
+  the file or database entry after syncing (depending on used ``--overwrite``
+  mode).
+
+* Updated translations.
+
+* Fixed issue with incorrectly splitting paths in ``sync_templates``.
+
+* Extended tests.
+
+* Fixed issue with cache settings handling.
+
+v1.0.1 (2011-04-14)
+-------------------
+
+* Minor bugfixes with regard to the new cache handling.
+
+v1.0 (2011-04-11)
+-----------------
 
 .. warning::
     This is the first stable release of django-dbtemplates which comes with a
@@ -25,46 +211,46 @@ Changelog
 
 * Use ReadTheDocs for documentation hosting.
 
-0.8.0 (11-07-10)
-----------------
+v0.8.0 (2010-11-07)
+-------------------
 
 * Added Finnish translation (by jholster)
 
 * Added --overwrite and --app-first options to sync_templates command (by Alex Kamedov).
 
-0.7.4 (09-23-10)
-----------------
+v0.7.4 (2010-09-23)
+-------------------
 
 * Fixed tests.
 
-0.7.3 (09-21-10)
-----------------
+v0.7.3 (2010-09-21)
+-------------------
 
 * Added ``DBTEMPLATES_AUTO_POPULATE_CONTENT`` setting to be able to disable
   to auto-populating of template content.
 
 * Fixed cosmetic issue in admin with collapsable fields.
 
-0.7.2 (09-04-10)
-----------------
+v0.7.2 (2010-09-04)
+-------------------
 
 * Moved to Github again. Sigh.
 
-0.7.1 (07-07-10)
-----------------
+v0.7.1 (2010-07-07)
+-------------------
 
 * Fixed problem with the CodeMirror textarea, which wasn't completely
   disabled before.
 
 * Fixed problem with the ``DBTEMPLATES_MEDIA_PREFIX`` setting, which defaults
   now to ``os.path.join(settings.MEDIA_ROOT, 'dbtemplates')`` now.
-  
+
   In other words, if you don't specify a ``DBTEMPLATES_MEDIA_PREFIX`` setting
   and have the CodeMirror textarea enabled, dbtemplates will look in a
   subdirectory of your site's ``MEDIA_ROOT`` for the CodeMirror media files.
 
-0.7.0 (06-24-10)
-----------------
+v0.7.0 (2010-06-24)
+-------------------
 
 * Added CodeMirror_-based syntax highlighting textarea, based on the amaxing
   work_ by `Nic Pottier`_. Set the ``DBTEMPLATES_USE_CODEMIRROR`` setting
@@ -85,14 +271,14 @@ Changelog
 .. _work: https://gist.github.com/368758/86bcafe53c438e2e2a0e3442c3b30f2c6011fbba
 .. _`Nic Pottier`: http://github.com/nicpottier
 
-0.6.1 (10-19-09):
------------------
+v0.6.1 (2009-10-19)
+-------------------
 
 * Fixed issue with default site of a template, added ability to disable
   default site (``DBTEMPLATES_ADD_DEFAULT_SITE``).
 
-0.6.0 (10-09-09):
------------------
+v0.6.0 (2009-10-09)
+-------------------
 
 * Updated and added locales (Danish, Brazilian Portuguese)
 
@@ -102,8 +288,8 @@ Changelog
 
 * Added Sphinx documentation
 
-0.5.7
------
+v0.5.7
+------
 
 * Updates to the docs
 
@@ -117,8 +303,8 @@ Changelog
 
 * fixed bug in ``create_error_template`` command.
 
-0.5.4
------
+v0.5.4
+------
 
 * Made loader and cache backends site-aware.
 
@@ -130,16 +316,16 @@ Changelog
 * Template is now saved explicitly to backend if not existent in cache
   (e.g. if deleted manually or invalidated).
 
-0.5.3
------
+v0.5.3
+------
 
-* Removed automatic creation of 404.html and 500.html templates and added a
+* Removed automatic creation of 404.html and 50v0.html templates and added a
   new management command for those cases called ``create_error_templates``
 
 * Also reverted move to Bitbucket
 
-0.5.2
------
+v0.5.2
+------
 
 * Fixed a problem with ``django.contrib.sites`` when its table hasn't been
   populated yet on initialization of dbtemplates. Thanks for the report,
@@ -147,8 +333,8 @@ Changelog
 
 * Added an example Django project and docs for it
 
-0.5.1
------
+v0.5.1
+------
 
 * Removed unneeded code that registered the model with reversion.
 
@@ -159,8 +345,8 @@ Changelog
 * Removed legacy ``sync_templates.py`` script, use ``django-admin.py
   sync_templates`` from now on.
 
-0.5.0
------
+v0.5.0
+------
 
 * Added support for `django-reversion`_
 
@@ -168,69 +354,69 @@ Changelog
   empty by using Django's other template loaders
 
 * added caching backend system with two default backends:
-  
+
   * ``FileSystemBackend``
   * ``DjangoCacheBackend``
-  
+
   More about it in the `blog post`_ and in the docs.
 
 .. _django-reversion: http://code.google.com/p/django-reversion/
 .. _blog post: http://jannisleidel.com/2008/11/updates-to-django-dbtemplates-and-half-assed-promise/
 
-0.4.7
------
+v0.4.7
+------
 
 * Minor bugfix
 
-0.4.6
------
+v0.4.6
+------
 
 * Minor doc change and PyPI support
 
-0.4.5
------
+v0.4.5
+------
 
 * fixed the --force option of the sync_templates command
 
-0.4.4
------
+v0.4.4
+------
 
 * fixed error in custom model save() after changes in Django `r8670`_.
 
 .. _r8670: http://code.djangoproject.com/changeset/8670
 
-0.4.3
------
+v0.4.3
+------
 
 * removed oldforms code
 
-0.4.2
------
+v0.4.2
+------
 
 * added Hebrew translation (by mkriheli)
 
-0.4.1
------
+v0.4.1
+------
 
 * added French (by Roland Frederic) and German locale
 
-0.4.0
------
+v0.4.0
+------
 
 * adds better support for newforms-admin
 
 * don't forget to load the dbtemplates.admin, e.g. by using
   django.contrib.admin.autodiscover() in you urls.py
 
-0.3.1
------
+v0.3.1
+------
 
 * adds a new management command *sync_templates* for bidirectional syncing
   between filesystem and database (backwards-compatible) and
   FilesystemCaching (thanks, Arne Brodowski!)
 
-0.2.5
------
+v0.2.5
+------
 
 * adds support for newforms-admin
 
@@ -239,4 +425,4 @@ Support
 
 Please leave your questions and messages on the designated site:
 
-http://github.com/jezdez/django-dbtemplates/issues/
+http://github.com/jazzband/django-dbtemplates/issues/

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # django-dbtemplates documentation build configuration file, created by
 # sphinx-quickstart on Fri Oct  9 14:52:11 2009.
@@ -16,7 +15,7 @@ import sys, os
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.append(os.path.abspath('.'))
+sys.path.append(os.path.abspath('.'))
 
 # -- General configuration -----------------------------------------------------
 
@@ -37,17 +36,22 @@ source_suffix = '.txt'
 master_doc = 'index'
 
 # General information about the project.
-project = u'django-dbtemplates'
-copyright = u'2010, Jannis Leidel'
+project = 'django-dbtemplates'
+copyright = '2007-2019, Jannis Leidel and contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
-# The full version, including alpha/beta/rc tags.
-release = '1.0.1'
+try:
+    from dbtemplates import __version__
+    # The short X.Y version.
+    version = '.'.join(__version__.split('.')[:2])
+    # The full version, including alpha/beta/rc tags.
+    release = __version__
+except ImportError:
+    version = release = 'dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -172,8 +176,8 @@ htmlhelp_basename = 'django-dbtemplatesdoc'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'django-dbtemplates.tex', u'django-dbtemplates Documentation',
-   u'Jannis Leidel', 'manual'),
+  ('index', 'django-dbtemplates.tex', 'django-dbtemplates Documentation',
+   'Jannis Leidel and contributors', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

docs/index.txt

@@ -11,6 +11,10 @@ It also features optional support for :ref:`versioned storage <versioned>`
 and :ref:`django-admin command <commands>`, integrates with Django's
 :ref:`caching system <caching>` and the :ref:`admin actions <admin_actions>`.
 
+Please see https://django-dbtemplates.readthedocs.io/ for more details.
+
+The source code and issue tracker can be found on Github: https://github.com/jazzband/django-dbtemplates
+
 .. _template loader: http://docs.djangoproject.com/en/dev/ref/templates/api/#loading-templates
 
 Contents:

docs/overview.txt

@@ -2,9 +2,8 @@ Setup
 =====
 
 1. Get the source from the `Git repository`_ or install it from the
-   Python Package Index by running ``pip django-dbtemplates``.
-2. Follow the instructions in the INSTALL file
-3. Edit the settings.py of your Django site:
+   Python Package Index by running ``pip install django-dbtemplates``.
+2. Edit the settings.py of your Django site:
 
    * Add ``dbtemplates`` to the ``INSTALLED_APPS`` setting
 
@@ -24,28 +23,54 @@ Setup
              'dbtemplates',
          )
 
-   * Add ``dbtemplates.loader.Loader`` to the ``TEMPLATE_LOADERS`` list
+   * Add ``dbtemplates.loader.Loader`` to the ``TEMPLATES.OPTIONS.loaders`` list
      in the settings.py of your Django project.
 
      It should look something like this::
 
-       TEMPLATE_LOADERS = (
-           'django.template.loaders.filesystem.load_template_source',
-           'django.template.loaders.app_directories.load_template_source',
-           'dbtemplates.loader.Loader',
-       )
+      TEMPLATES = [
+        {
+            'BACKEND': 'django.template.backends.django.DjangoTemplates',
+            'DIRS': [ # your template dirs here
+            ],
+            'APP_DIRS': False,
+            'OPTIONS': {
+                'context_processors': [
+                    'django.contrib.auth.context_processors.auth',
+                    'django.template.context_processors.debug',
+                    'django.template.context_processors.i18n',
+                    'django.template.context_processors.media',
+                    'django.template.context_processors.static',
+                    'django.template.context_processors.tz',
+                    'django.contrib.messages.context_processors.messages',
+                    'django.template.context_processors.request',
+                ],
+                'loaders': [
+                    'django.template.loaders.filesystem.Loader',
+                    'django.template.loaders.app_directories.Loader',
+                    'dbtemplates.loader.Loader',
+                ],
+            },
+        },
+     ]
 
-4. Sync your database ``python manage.py syncdb``
-5. Restart your Django server
+     The order of ``TEMPLATES.OPTIONS.loaders`` is important. In the former
+     example, templates from the database will be used as a fallback (ie. when
+     the template does not exists in other locations). If you want the template
+     from the database to be used to override templates in other locations,
+     put ``dbtemplates.loader.Loader`` at the beginning of ``loaders``.
 
-.. _Git repository: http://github.com/jezdez/django-dbtemplates/
+3. Sync your database ``python manage.py migrate``
+4. Restart your Django server
+
+.. _Git repository: https://github.com/jazzband/django-dbtemplates/
 
 Usage
 =====
 
 Creating database templates is pretty simple: Just open the admin interface
 of your Django-based site in your browser and click on "Templates" in the
-"Dbtemplates" section.
+"Database templates" section.
 
 There you only need to fill in the ``name`` field with the identifier, Django
 is supposed to use while searching for templates, e.g.
@@ -59,44 +84,3 @@ other template loaders. For example, if you have a template called
 contents in the database, you just need to leave the content field empty to
 automatically populate it. That's especially useful if you don't want to
 copy and paste its content manually to the textarea.
-
-Example
-=======
-
-``dbtemplates`` comes with an example Django project that let's you try it 
-out. The example uses Django's own `flatpages app`_ to enable you to create
-a simple page using ``dbtemplates``. Flat pages are a perfect fit to
-dbtemplates since they come prepackaged and are simple to use.
-
-Here is how it works:
-
-1. Open your command line and change to the ``example`` directory in the
-   directory with the extracted source distribution.
-2. Run ``python manage.py syncdb`` and follow the instructions.
-3. Run ``python manage.py runserver`` and open your favorite browser with the
-   address http://127.0.0.1:8000/admin/.
-4. Next add a new `Template` object in the ``dbtemplates`` section and use
-   ``flatpages/default.html`` as the value for the ``name`` field. For the
-   ``content`` field use this example::
-
-        <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-            "http://www.w3.org/TR/REC-html40/loose.dtd">
-        <html>
-        <head>
-        <title>{{ flatpage.title }}</title>
-        </head>
-        <body>
-        {{ flatpage.content }}
-        </body>
-        </html>
-
-5. Return to the home screen of the admin interface and add a new flat page.
-   Use ``/`` (yep, just a forward slash) and whatever ``title`` and 
-   ``content`` you prefer. Please make sure you select the default site
-   ``example.com`` before you save the flat page.
-6. Visit http://127.0.0.1:8000/ and see the flat page you just created 
-   rendered with the ``flatpages/default.html`` template provided by  
-   ``dbtemplates``.
-
-.. _flatpages app: http://docs.djangoproject.com/en/dev/ref/contrib/flatpages/
-

docs/settings.txt

@@ -4,8 +4,8 @@ Settings
 ``DBTEMPLATES_ADD_DEFAULT_SITE``
 --------------------------------
 
-``dbtemplates`` adds the current site (``settings.SITE_ID``) to the database  
-template when it is created by default. You can disable this feature by   
+``dbtemplates`` adds the current site (``settings.SITE_ID``) to the database
+template when it is created by default. You can disable this feature by
 setting ``DBTEMPLATES_ADD_DEFAULT_SITE`` to ``False``.
 
 ``DBTEMPLATES_AUTO_POPULATE_CONTENT``
@@ -28,11 +28,24 @@ The dotted Python path to the cache backend class. See
 A boolean, if enabled triggers the use of the CodeMirror based editor.
 Set to ``False`` by default.
 
+``DBTEMPLATES_USE_TINYMCE``
+---------------------------
+
+.. versionadded:: 1.3
+
+A boolean, if enabled triggers the use of the TinyMCE based editor.
+Set to ``False`` by default.
+
 ``DBTEMPLATES_USE_REVERSION``
 -----------------------------
 
 A boolean, if enabled triggers the use of ``django-reversion``.
 
+``DBTEMPLATES_USE_REVERSION_COMPARE``
+-----------------------------
+
+A boolean, if enabled triggers the use of ``django-reversion-compare``.
+
 ``DBTEMPLATES_MEDIA_PREFIX``
 ----------------------------
 

example/manage.py

@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-import os, sys
-from django.core.management import execute_manager
-
-sys.path.insert(0, os.path.abspath('./..'))
-
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
-
-if __name__ == "__main__":
-    execute_manager(settings)

example/requirements.txt

@@ -1 +0,0 @@
-django-staticfiles

example/settings.py

@@ -1,112 +0,0 @@
-# Django settings for example project.
-import os, posixpath
-
-PROJECT_ROOT = os.path.abspath(os.path.dirname(__file__))
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-    # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = 'example.db'             # Or path to database file if using sqlite3.
-DATABASE_USER = ''             # Not used with sqlite3.
-DATABASE_PASSWORD = ''         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
-
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.sqlite3",
-        "NAME": DATABASE_NAME,
-    }
-}
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'America/Chicago'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = os.path.join(PROJECT_ROOT, "site_media", "media")
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = "/site_media/media/"
-
-# Absolute path to the directory that holds static files like app media.
-# Example: "/home/media/media.lawrence.com/apps/"
-STATIC_ROOT = os.path.join(PROJECT_ROOT, "site_media", "static")
-
-# URL that handles the static files like app media.
-# Example: "http://media.lawrence.com"
-STATIC_URL = "/site_media/static/"
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = posixpath.join(STATIC_URL, "admin/")
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = 'e-%(1e1f8ar2v)_8d!%-75a2ag(w(ht*l%n-wts5$li!5=97)8'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
-    'django.template.loaders.eggs.load_template_source',
-    'dbtemplates.loader.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
-)
-
-ROOT_URLCONF = 'example.urls'
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.admin',
-    'django.contrib.flatpages',
-    'dbtemplates',
-    'staticfiles',
-    #'reversion',
-)
-
-# Uncomment the following two settings to use the file system cache backend.
-# It will cache in the directory "cache" inside the example project directory.
-DBTEMPLATES_CACHE_BACKEND = "locmem://"
-
-DBTEMPLATES_MEDIA_PREFIX = posixpath.join(STATIC_URL, "dbtemplates/")
-DBTEMPLATES_USE_CODEMIRROR = True
-

example/urls.py

@@ -1,24 +0,0 @@
-from django.conf import settings
-from django.conf.urls.defaults import patterns, include
-
-# Uncomment the next two lines to enable the admin:
-from django.contrib import admin
-admin.autodiscover()
-
-urlpatterns = patterns('',
-    # Example:
-    # (r'^example/', include('example.foo.urls')),
-
-    # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 
-    # to INSTALLED_APPS to enable admin documentation:
-    # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
-    (r'^admin/', include(admin.site.urls)),
-)
-
-# the following is used to serve up local media files like images
-if settings.DEBUG:
-    urlpatterns += patterns("",
-        (r"", include("staticfiles.urls")),
-    )

pyproject.toml

@@ -0,0 +1,51 @@
+[build-system]
+requires = [
+    "setuptools>=61.2",
+    "setuptools_scm",
+]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "django-dbtemplates"
+authors = [{name = "Jannis Leidel", email = "jannis@leidel.info"}]
+description = "Template loader for templates stored in the database"
+readme = "README.rst"
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Web Environment",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: BSD License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Framework :: Django",
+]
+requires-python = ">=3.8"
+dependencies = ["django-appconf >= 0.4"]
+dynamic = ["version"]
+
+[project.urls]
+Documentation = "https://django-dbtemplates.readthedocs.io/"
+Changelog = "https://django-dbtemplates.readthedocs.io/en/latest/changelog.html"
+Source = "https://github.com/jazzband/django-dbtemplates"
+
+[tool.setuptools]
+zip-safe = false
+include-package-data = false
+
+[tool.setuptools.packages]
+find = {namespaces = false}
+
+[tool.setuptools.package-data]
+dbtemplates = [
+    "locale/*/LC_MESSAGES/*",
+    "static/dbtemplates/css/*.css",
+    "static/dbtemplates/js/*.js",
+]

requirements/docs.txt

@@ -0,0 +1 @@
+django

requirements/tests.txt

@@ -0,0 +1,2 @@
+flake8
+coverage

runtests.py

@@ -1,32 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-from django.conf import settings
-
-if not settings.configured:
-    settings.configure(
-        DBTEMPLATES_CACHE_BACKEND = 'dummy://',
-        DATABASE_ENGINE='sqlite3',
-        SITE_ID=1,
-        INSTALLED_APPS=[
-            'django.contrib.contenttypes',
-            'django.contrib.sites',
-            'django.contrib.admin',
-            'dbtemplates',
-        ],
-    )
-
-from django.test.simple import run_tests
-
-
-def runtests(*test_args):
-    if not test_args:
-        test_args = ['dbtemplates']
-    sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'dbtemplates'))
-    failures = run_tests(test_args, verbosity=1, interactive=True)
-    sys.exit(failures)
-
-
-if __name__ == '__main__':
-    runtests(*sys.argv[1:])

setup.cfg

@@ -1,13 +0,0 @@
-[egg_info]
-#tag_build = a1
-
-[build_sphinx]
-source-dir = docs/
-build-dir  = docs/_build
-all_files  = 1
-
-[upload_docs]
-upload-dir = docs/_build/html
-
-[upload_sphinx]
-upload-dir = docs/_build/html

setup.py

@@ -1,29 +0,0 @@
-from setuptools import setup, find_packages
-
-setup(
-    name='django-dbtemplates',
-    version=__import__('dbtemplates').__version__,
-    description='Template loader for templates stored in the database',
-    long_description=open('README.rst').read(),
-    author='Jannis Leidel',
-    author_email='jannis@leidel.info',
-    url='http://django-dbtemplates.readthedocs.org/',
-    packages=find_packages(exclude=['example']),
-    zip_safe=False,
-    package_data = {
-        'dbtemplates': [
-            'locale/*/LC_MESSAGES/*',
-            'static/dbtemplates/css/*.css',
-            'static/dbtemplates/js/*.js',
-        ],
-    },
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Environment :: Web Environment',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Framework :: Django',
-    ],
-)

tox.ini

@@ -1,58 +1,61 @@
 [tox]
-downloadcache = .tox/_download/
-distribute = False
+minversion = 4.0
 envlist =
-    py25-1.1.X, py26-1.1.X, py27-1.1.X,
-    py25-1.2.X, py26-1.2.X, py27-1.2.X,
-    py25-1.3.X, py26-1.3.X, py27-1.3.X
+    flake8
+    py3{8,9,10,11,12}-dj42
+    py3{10,11,12}-dj{50}
+    py3{10,11,12,13}-dj{51,52}
+    py3{12,13}-dj{main}
+    coverage
+
+[gh-actions]
+python =
+    3.8: py38
+    3.9: py39
+    3.10: py310
+    3.10: py310, flake8
+    3.11: py311
+    3.12: py312
+    3.13: py313
 
 [testenv]
+skipsdist = true
+package = editable
+basepython =
+    py38: python3.8
+    py39: python3.9
+    py310: python3.10
+    py311: python3.11
+    py312: python3.12
+    py313: python3.13
+setenv =
+    DJANGO_SETTINGS_MODULE = dbtemplates.test_settings
+deps =
+    -r requirements/tests.txt
+    dj42: Django>=4.2,<4.3
+    dj50: Django>=5.0,<5.1
+    dj51: Django>=5.1,<5.2
+    dj52: Django>=5.2,<5.3
+    djmain: https://github.com/django/django/archive/main.tar.gz#egg=django
+
 commands =
-    python runtests.py
+    python --version
+    python -c "import django ; print(django.VERSION)"
+    coverage run --branch --parallel-mode {envbindir}/django-admin test -v2 {posargs:dbtemplates}
 
-[testenv:py25-1.1.X]
-basepython = python2.5
-deps =
-    django==1.1.4
+[testenv:coverage]
+basepython = python3.10
+deps = coverage
+commands =
+    coverage combine
+    coverage report
+    coverage xml
 
-[testenv:py26-1.1.X]
-basepython = python2.6
-deps =
-    django==1.1.4
+[testenv:flake8]
+basepython = python3.10
+commands = flake8 dbtemplates
+deps = flake8
 
-[testenv:py27-1.1.X]
-basepython = python2.7
-deps =
-    django==1.1.4
-
-
-[testenv:py25-1.2.X]
-basepython = python2.5
-deps =
-    django==1.2.5
-
-[testenv:py26-1.2.X]
-basepython = python2.6
-deps =
-    django==1.2.5
-
-[testenv:py27-1.2.X]
-basepython = python2.7
-deps =
-    django==1.2.5
-
-
-[testenv:py25-1.3.X]
-basepython = python2.5
-deps =
-    django==1.3
-
-[testenv:py26-1.3.X]
-basepython = python2.6
-deps =
-    django==1.3
-
-[testenv:py27-1.3.X]
-basepython = python2.7
-deps =
-    django==1.3
+[flake8]
+exclude=.tox
+ignore=E501,E127,E128,E124