Improved tests for Django < 1.8

Author: dyve

HISTORY.rst

@@ -3,6 +3,11 @@
 History
 -------
 
+Development
++++++++++++
+
+* Make simple_tag output saf ein Django 1.9
+
 
 6.1.0 (2015-06-25)
 ++++++++++++++++++

bootstrap3/legacy.py

@@ -0,0 +1,13 @@
+from django.utils.html import conditional_escape
+from django.utils.safestring import mark_safe
+
+
+def format_html_pre_18(format_string, *args, **kwargs):
+    """
+    Fake function to support format_html in Django < 1.8
+    """
+    args_safe = map(conditional_escape, args)
+    kwargs_safe = {}
+    for k in kwargs:
+        kwargs_safe[k] = conditional_escape(kwargs[k])
+    return mark_safe(format_string.format(*args_safe, **kwargs_safe))

bootstrap3/renderers.py

@@ -16,7 +16,7 @@
 from .bootstrap import get_bootstrap_setting
 from .text import text_value
 from .exceptions import BootstrapError
-from .utils import add_css_class
+from .utils import add_css_class, render_template_to_unicode
 from .forms import (
     render_form, render_field, render_label, render_form_group,
     is_widget_with_placeholder, is_widget_required_attribute, FORM_GROUP_CLASS
@@ -27,6 +27,7 @@ class BaseRenderer(object):
     """
     A content renderer
     """
+
     def __init__(self, *args, **kwargs):
         self.layout = kwargs.get('layout', '')
         self.form_group_class = kwargs.get(
@@ -116,11 +117,14 @@ def get_formset_errors(self):
     def render_errors(self):
         formset_errors = self.get_formset_errors()
         if formset_errors:
-            return get_template('bootstrap3/form_errors.html').render({
+            return render_template_to_unicode(
+                'bootstrap3/form_errors.html',
+                context={
                     'errors': formset_errors,
                     'form': self.formset,
                     'layout': self.layout,
-            })
+                }
+            )
         return ''
 
     def _render(self):
@@ -185,11 +189,15 @@ def render_errors(self, type='all'):
             form_errors = self.form.non_field_errors()
 
         if form_errors:
-            return get_template('bootstrap3/form_errors.html').render({
-                'errors': form_errors,
-                'form': self.form,
-                'layout': self.layout,
-            })
+            return render_template_to_unicode(
+                'bootstrap3/form_errors.html',
+                context={
+                    'errors': form_errors,
+                    'form': self.form,
+                    'layout': self.layout,
+                }
+            )
+
         return ''
 
     def _render(self):
@@ -384,18 +392,20 @@ def make_input_group(self, html):
         return html
 
     def append_to_field(self, html):
-        help_text_and_errors = [self.field_help] + self.field_errors \
-            if self.field_help else self.field_errors
+        help_text_and_errors = []
+        if self.field_help:
+            help_text_and_errors.append(self.field_help)
+        help_text_and_errors += self.field_errors
         if help_text_and_errors:
-            help_html = get_template(
-                'bootstrap3/field_help_text_and_errors.html'
-            ).render({
-                'field': self.field,
-                'help_text_and_errors': help_text_and_errors,
-                'layout': self.layout,
-            })
-            html += '<span class="help-block">{help}</span>'.format(
-                help=help_html)
+            help_html = render_template_to_unicode(
+                'bootstrap3/field_help_text_and_errors.html',
+                context={
+                    'field': self.field,
+                    'help_text_and_errors': help_text_and_errors,
+                    'layout': self.layout,
+                }
+            )
+            html += '<span class="help-block">{help}</span>'.format(help=help_html)
         return html
 
     def get_field_class(self):

bootstrap3/templatetags/bootstrap3.py

@@ -12,7 +12,7 @@
 from ..bootstrap import (
     css_url, javascript_url, jquery_url, theme_url, get_bootstrap_setting
 )
-from ..utils import render_link_tag, render_tag
+from ..utils import render_link_tag, render_tag, render_template_to_unicode
 from ..forms import (
     render_button, render_field, render_field_and_label, render_form,
     render_form_group, render_formset,
@@ -522,7 +522,7 @@ def bootstrap_messages(context, *args, **kwargs):
         {% bootstrap_messages FIXTHIS %}
 
     """
-    return get_template('bootstrap3/messages.html').render(context)
+    return render_template_to_unicode('bootstrap3/messages.html', context=context)
 
 
 @register.inclusion_tag('bootstrap3/pagination.html')

bootstrap3/tests.py

@@ -11,14 +11,13 @@
 
 from .text import text_value, text_concat
 from .exceptions import BootstrapError
-from .utils import add_css_class, render_tag
+from .utils import add_css_class, render_tag, render_template_to_unicode
 
 try:
     from html.parser import HTMLParser
 except ImportError:
     from HTMLParser import HTMLParser
 
-
 RADIO_CHOICES = (
     ('1', 'Radio 1'),
     ('2', 'Radio 2'),
@@ -29,12 +28,12 @@
         ('vinyl', 'Vinyl'),
         ('cd', 'CD'),
     )
-    ),
+     ),
     ('Video', (
         ('vhs', 'VHS Tape'),
         ('dvd', 'DVD'),
     )
-    ),
+     ),
     ('unknown', 'Unknown'),
 )
 
@@ -108,7 +107,7 @@ def render_template(text, **context_args):
     template = Template("{% load bootstrap3 %}" + text)
     if 'form' not in context_args:
         context_args['form'] = TestForm()
-    return template.render(Context(context_args))
+    return render_template_to_unicode(template, context=context_args)
 
 
 def render_formset(formset=None, **context_args):
@@ -169,11 +168,17 @@ def test_settings(self):
 
     def test_bootstrap_javascript_tag(self):
         res = render_template('{% bootstrap_javascript %}')
-        self.assertEqual(res.strip(), '<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>')
+        self.assertEqual(
+            res.strip(),
+            '<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>'
+        )
 
     def test_bootstrap_css_tag(self):
         res = render_template('{% bootstrap_css %}')
-        self.assertEqual(res.strip(), '<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">')
+        self.assertIn(res.strip(), [
+            '<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">',
+            '<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">',
+        ])
 
     def test_settings_filter(self):
         res = render_template('{{ "required_css_class"|bootstrap_setting }}')
@@ -213,7 +218,7 @@ def test_bootstrap_template(self):
             'test_bootstrap3_content' +
             '{% endblock %}'
         ))
-        res = template.render(Context({}))
+        res = render_template_to_unicode(template)
         self.assertIn('test_bootstrap3_content', res)
 
     def test_javascript_without_jquery(self):
@@ -356,6 +361,7 @@ def _test_size_medium(param):
             self.assertNotIn('input-lg', res)
             self.assertNotIn('input-sm', res)
             self.assertNotIn('input-md', res)
+
         _test_size('sm', 'input-sm')
         _test_size('small', 'input-sm')
         _test_size('lg', 'input-lg')
@@ -372,10 +378,10 @@ def test_icon(self):
             res.strip(), '<span class="glyphicon glyphicon-star"></span>')
         res = render_template(
             '{% bootstrap_icon "star" title="alpha centauri" %}')
-        self.assertEqual(
-            res.strip(),
-            '<span class="glyphicon glyphicon-star" ' +
-            'title="alpha centauri"></span>')
+        self.assertIn(res.strip(), [
+            '<span class="glyphicon glyphicon-star" title="alpha centauri"></span>',
+            '<span title="alpha centauri" class="glyphicon glyphicon-star"></span>',
+        ])
 
     def test_alert(self):
         res = render_template(

bootstrap3/utils.py

@@ -4,11 +4,16 @@
 import re
 
 from django.forms.widgets import flatatt
-from django.template import Variable, VariableDoesNotExist
+from django.template import Variable, VariableDoesNotExist, Template, Context
 from django.template.base import FilterExpression, kwarg_re, TemplateSyntaxError
-from django.utils.html import format_html
+from django.template.loader import get_template
 from django.utils.safestring import mark_safe
 
+try:
+    from django.utils.html import format_html
+except ImportError:
+    from .legacy import format_html_pre_18 as format_html
+
 from .text import text_value
 
 
@@ -124,3 +129,14 @@ def render_tag(tag, attrs=None, content=None, close=True):
         attrs=mark_safe(flatatt(attrs)) if attrs else '',
         content=text_value(content),
     )
+
+
+def render_template_to_unicode(template, context=None):
+    """
+    Render a Template to unicode
+    """
+    if not isinstance(template, Template):
+        template = get_template(template)
+    if context is None:
+        context = {}
+    return template.render(Context(context))

testsettings.py

@@ -48,6 +48,8 @@
     },
 ]
 
+ROOT_URLCONF = None
+
 BOOTSTRAP3 = {
     'javascript_in_head': True,
     'required_css_class': 'bootstrap3-req',

tox.ini

@@ -13,18 +13,22 @@ envlist =
     py27-django15,
     py27-django16,
     py27-django17,
+    py27-django18,
 
     py32-django15,
     py32-django16,
     py32-django17,
+    py32-django18,
 
     py33-django15,
     py33-django16,
     py33-django17,
+    py33-django18,
 
     py34-django15,
     py34-django16,
     py34-django17,
+    py34-django18,
 
 [testenv]
 commands = python manage.py test
@@ -33,3 +37,4 @@ deps =
     django15: django >=1.5,<1.6
     django16: django >=1.6,<1.7
     django17: django >=1.7,<1.8
+    django18: django >=1.8,<1.9