Merge pull request #509 from carltongibson/develop

Version 0.15.2
carltongibson · Sep 29, 2016 · 783940d · 783940d
2 parents a96f93a + e40e45e
commit 783940d
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 8 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.15.1
+current_version = 0.15.2
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,10 @@
+
+Version 0.15.2 (2016-09-29)
+---------------------------
+
+* #507 Fix compatibility issue when not using the DTL
+
+
 Version 0.15.1 (2016-09-28)
 ---------------------------
 

diff --git a/django_filters/__init__.py b/django_filters/__init__.py
@@ -3,7 +3,7 @@
 from .filterset import FilterSet
 from .filters import *
 
-__version__ = '0.15.1'
+__version__ = '0.15.2'
 
 
 def parse_version(version):

diff --git a/django_filters/rest_framework/backends.py b/django_filters/rest_framework/backends.py
@@ -30,11 +30,11 @@
 
 if compat.is_crispy:
     template_path = 'django_filters/rest_framework/crispy_form.html'
-    template_default = Template(CRISPY_TEMPLATE)
+    template_default = CRISPY_TEMPLATE
 
 else:
     template_path = 'django_filters/rest_framework/form.html'
-    template_default = Template(FILTER_TEMPLATE)
+    template_default = FILTER_TEMPLATE
 
 
 class DjangoFilterBackend(BaseFilterBackend):
@@ -84,7 +84,7 @@ def to_html(self, request, queryset, view):
         try:
             template = loader.get_template(self.template)
         except TemplateDoesNotExist:
-            template = template_default
+            template = Template(template_default)
 
         return template_render(template, context={
             'filter': filter_instance

diff --git a/docs/conf.py b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.15.1'
+version = '0.15.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.15.1'
+release = '0.15.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 readme = f.read()
 f.close()
 
-version = '0.15.1'
+version = '0.15.2'
 
 if sys.argv[-1] == 'publish':
     if os.system("pip freeze | grep wheel"):

diff --git a/tests/rest_framework/test_backends.py b/tests/rest_framework/test_backends.py
@@ -19,6 +19,7 @@
 
 from django_filters import filters
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
+from django_filters.rest_framework import backends
 
 from .models import BaseFilterableItem, BasicModel, FilterableItem, DjangoFilterOrderingModel
 
@@ -327,6 +328,17 @@ class Backend(view.filter_backends[0]):
 
         self.assertHTMLEqual(html, "Test")
 
+    @override_settings(TEMPLATES=[])
+    def test_DTL_missing(self):
+        # The backend should be importable even if the DTL is not used.
+        # See: https://github.com/carltongibson/django-filter/issues/506
+        try:
+            from importlib import reload  # python 3.4
+        except ImportError:
+            from imp import reload
+
+        reload(backends)
+
 
 @override_settings(ROOT_URLCONF='tests.rest_framework.test_backends')
 class IntegrationTestDetailFiltering(CommonFilteringTestCase):