Merge branch 'release/6.2.0'

Author: dyve

.travis.yml

@@ -9,10 +9,11 @@ python:
 
 # Django versions for matrix
 env:
-  - DJANGO_VERSION=1.4.18
+  - DJANGO_VERSION=1.4.21
   - DJANGO_VERSION=1.5.12
-  - DJANGO_VERSION=1.6.10
-  - DJANGO_VERSION=1.7.3
+  - DJANGO_VERSION=1.6.11
+  - DJANGO_VERSION=1.7.9
+  - DJANGO_VERSION=1.8.3
 
 # Command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
@@ -28,19 +29,21 @@ script:
 matrix:
   exclude:
     - python: "3.2"
-      env: DJANGO_VERSION=1.4.18
+      env: DJANGO_VERSION=1.4.21
     - python: "3.3"
-      env: DJANGO_VERSION=1.4.18
+      env: DJANGO_VERSION=1.4.21
     - python: "3.4"
-      env: DJANGO_VERSION=1.4.18
+      env: DJANGO_VERSION=1.4.21
     - python: "3.2"
       env: DJANGO_VERSION=1.5.12
     - python: "3.3"
       env: DJANGO_VERSION=1.5.12
     - python: "3.4"
       env: DJANGO_VERSION=1.5.12
     - python: "2.6"
-      env: DJANGO_VERSION=1.7.3
+      env: DJANGO_VERSION=1.7.9
+    - python: "2.6"
+      env: DJANGO_VERSION=1.8.3
 
 # Report to coveralls
 after_success:

HISTORY.rst

@@ -3,6 +3,14 @@
 History
 -------
 
+6.2.0 (2015-08-15)
+++++++++++++++++++
+
+* Improved tests
+* Make simple_tag output safe in Django 1.9
+* Better support for MultiWidgets (@xrmx)
+* Better documentation (@Moustacha)
+
 
 6.1.0 (2015-06-25)
 ++++++++++++++++++

README.rst

@@ -1,21 +1,23 @@
-============================
-Welcome to django-bootstrap3
-============================
+======================
+Bootstrap 3 for Django
+======================
 
-.. image:: https://travis-ci.org/dyve/django-bootstrap3.png?branch=master
-    :target: https://travis-ci.org/dyve/django-bootstrap3
+Write Django as usual, and let ``django-bootstrap3`` make template output into Bootstrap 3 code.
 
-.. image:: https://coveralls.io/repos/dyve/django-bootstrap3/badge.png?branch=develop
-  :target: https://coveralls.io/r/dyve/django-bootstrap3?branch=develop
 
-.. image:: https://badge.fury.io/py/django-bootstrap3.png
-    :target: http://badge.fury.io/py/django-bootstrap3
+.. image:: https://img.shields.io/travis/dyve/django-bootstrap3/master.svg
+    :target: https://travis-ci.org/dyve/django-bootstrap3
 
-.. image:: https://pypip.in/d/django-bootstrap3/badge.png
-    :target: https://crate.io/packages/django-bootstrap3?version=latest
+.. image:: https://img.shields.io/coveralls/dyve/django-bootstrap3/master.svg
+  :target: https://coveralls.io/r/dyve/django-bootstrap3?branch=master
 
+.. image:: https://img.shields.io/pypi/v/django-bootstrap3.svg
+    :target: https://pypi.python.org/pypi/django-bootstrap3
+    :alt: Latest PyPI version
 
-Use Bootstrap in your Django templates, the Django way.
+.. image:: https://img.shields.io/pypi/dm/django-bootstrap3.svg
+    :target: https://pypi.python.org/pypi/django-bootstrap3
+    :alt: Number of PyPI downloads per month
 
 
 Installation

bootstrap3/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '6.1.0'
+__version__ = '6.2.0'

bootstrap3/components.py

@@ -2,6 +2,8 @@
 from __future__ import unicode_literals
 
 from django.forms.widgets import flatatt
+from django.utils.safestring import mark_safe
+from bootstrap3.utils import render_tag
 
 from .text import text_value
 
@@ -15,7 +17,7 @@ def render_icon(icon, title=''):
     }
     if title:
         attrs['title'] = title
-    return '<span{attrs}></span>'.format(attrs=flatatt(attrs))
+    return render_tag('span', attrs=attrs)
 
 
 def render_alert(content, alert_type=None, dismissable=True):
@@ -30,8 +32,9 @@ def render_alert(content, alert_type=None, dismissable=True):
         css_classes.append('alert-dismissable')
         button = '<button type="button" class="close" ' + \
                  'data-dismiss="alert" aria-hidden="true">&times;</button>'
-    return '<div class="{css_classes}">{button}{content}</div>'.format(
-        css_classes=' '.join(css_classes),
-        button=button,
-        content=text_value(content),
-    )
+    button_placeholder = '__BUTTON__'
+    return mark_safe(render_tag(
+        'div',
+        attrs={'class': ' '.join(css_classes)},
+        content=button_placeholder + text_value(content),
+    ).replace(button_placeholder, button))

bootstrap3/forms.py

@@ -117,8 +117,10 @@ def render_button(
     if value:
         attrs['value'] = value
     return render_tag(
-        tag, attrs=attrs, content=text_concat(
-            icon_content, content, separator=' '))
+        tag,
+        attrs=attrs,
+        content=text_concat(icon_content, content, separator=' '),
+    )
 
 
 def render_field_and_label(

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))