Merge branch 'release/5.0.0'

Author: dyve

.travis.yml

@@ -9,9 +9,10 @@ python:
 
 # Django versions for matrix
 env:
-  - DJANGO_VERSION=1.4.13
-  - DJANGO_VERSION=1.5.8
-  - DJANGO_VERSION=1.6.5
+  - DJANGO_VERSION=1.4.16
+  - DJANGO_VERSION=1.5.11
+  - DJANGO_VERSION=1.6.8
+  - DJANGO_VERSION=1.7.1
 
 # Command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
@@ -22,21 +23,24 @@ install:
 script:
   - coverage run --source=bootstrap3 manage.py test
 
-# Support Python3 only with Django 1.6
+# Support Python3 only with Django 1.6+
+# Support Django 1.7+ only with Python 2.7+
 matrix:
   exclude:
     - python: "3.2"
-      env: DJANGO_VERSION=1.4.13
+      env: DJANGO_VERSION=1.4.16
     - python: "3.3"
-      env: DJANGO_VERSION=1.4.13
+      env: DJANGO_VERSION=1.4.16
     - python: "3.4"
-      env: DJANGO_VERSION=1.4.13
+      env: DJANGO_VERSION=1.4.16
     - python: "3.2"
-      env: DJANGO_VERSION=1.5.8
+      env: DJANGO_VERSION=1.5.11
     - python: "3.3"
-      env: DJANGO_VERSION=1.5.8
+      env: DJANGO_VERSION=1.5.11
     - python: "3.4"
-      env: DJANGO_VERSION=1.5.8
+      env: DJANGO_VERSION=1.5.11
+    - python: "2.6"
+      env: DJANGO_VERSION=1.7.1
 
 # Report to coveralls
 after_success:

HISTORY.rst

@@ -4,6 +4,12 @@ History
 -------
 
 
+5.0.0 (2014-11-21)
+++++++++++++++++++
+
+* Bug fixes and update to Bootstrap 3.2.1
+
+
 4.11.0 (2014-08-19)
 +++++++++++++++++++
 

bootstrap3/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '4.11.0'
+__version__ = '5.0.0'

bootstrap3/bootstrap.py

@@ -8,7 +8,7 @@
 # Default settings
 BOOTSTRAP3_DEFAULTS = {
     'jquery_url': '//code.jquery.com/jquery.min.js',
-    'base_url': '//netdna.bootstrapcdn.com/bootstrap/3.2.0/',
+    'base_url': '//netdna.bootstrapcdn.com/bootstrap/3.3.1/',
     'css_url': None,
     'theme_url': None,
     'javascript_url': None,
@@ -65,14 +65,16 @@ def javascript_url():
     """
     Return the full url to the Bootstrap JavaScript file
     """
-    return get_bootstrap_setting('javascript_url') or bootstrap_url('js/bootstrap.min.js')
+    return get_bootstrap_setting('javascript_url') or \
+        bootstrap_url('js/bootstrap.min.js')
 
 
 def css_url():
     """
     Return the full url to the Bootstrap CSS file
     """
-    return get_bootstrap_setting('css_url') or bootstrap_url('css/bootstrap.min.css')
+    return get_bootstrap_setting('css_url') or \
+        bootstrap_url('css/bootstrap.min.css')
 
 
 def theme_url():
@@ -102,4 +104,3 @@ def get_form_renderer(**kwargs):
 def get_field_renderer(**kwargs):
     renderers = get_bootstrap_setting('field_renderers')
     return get_renderer(renderers, **kwargs)
-

bootstrap3/components.py

@@ -28,7 +28,8 @@ def render_alert(content, alert_type=None, dismissable=True):
     css_classes = ['alert', 'alert-' + text_value(alert_type)]
     if dismissable:
         css_classes.append('alert-dismissable')
-        button = '<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>'
+        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,

bootstrap3/forms.py

@@ -2,9 +2,14 @@
 from __future__ import unicode_literals
 
 from django.contrib.admin.widgets import AdminFileWidget
-from django.forms import HiddenInput, FileInput, CheckboxSelectMultiple, Textarea, TextInput
-
-from .bootstrap import get_bootstrap_setting, get_form_renderer, get_field_renderer, get_formset_renderer
+from django.forms import (
+    HiddenInput, FileInput, CheckboxSelectMultiple, Textarea, TextInput
+)
+
+from .bootstrap import (
+    get_bootstrap_setting, get_form_renderer, get_field_renderer,
+    get_formset_renderer
+)
 from .text import text_concat, text_value
 from .exceptions import BootstrapError
 from .html import add_css_class, render_tag
@@ -38,7 +43,7 @@ def render_form(form, **kwargs):
     return renderer_cls(form, **kwargs).render()
 
 
-def render_form_errors(form, layout='', type='all', **kwargs):
+def render_form_errors(form, type='all', **kwargs):
     """
     Render form errors to a Bootstrap layout
     """
@@ -68,7 +73,9 @@ def render_label(content, label_for=None, label_class=None, label_title=''):
     return render_tag('label', attrs=attrs, content=content)
 
 
-def render_button(content, button_type=None, icon=None, button_class='', size='', href=''):
+def render_button(
+        content, button_type=None, icon=None, button_class='', size='',
+        href=''):
     """
     Render a button with content
     """
@@ -84,12 +91,16 @@ def render_button(content, button_type=None, icon=None, button_class='', size=''
     elif size == 'md' or size == 'medium':
         pass
     elif size:
-        raise BootstrapError('Parameter "size" should be "xs", "sm", "lg" or empty ("{}" given).'.format(size))
+        raise BootstrapError(
+            'Parameter "size" should be "xs", "sm", "lg" or ' +
+            'empty ("{}" given).'.format(size))
     if button_type:
         if button_type == 'submit':
             classes = add_css_class(classes, 'btn-primary')
         elif button_type not in ('reset', 'button', 'link'):
-            raise BootstrapError('Parameter "button_type" should be "submit", "reset", "button", "link" or empty  ("{}" given).'.format(button_type))
+            raise BootstrapError(
+                'Parameter "button_type" should be "submit", "reset", ' +
+                '"button", "link" or empty  ("{}" given).'.format(button_type))
         attrs['type'] = button_type
     attrs['class'] = classes
     icon_content = render_icon(icon) if icon else ''
@@ -98,10 +109,14 @@ def render_button(content, button_type=None, icon=None, button_class='', size=''
         tag = 'a'
     else:
         tag = 'button'
-    return render_tag(tag, attrs=attrs, content=text_concat(icon_content, content, separator=' '))
+    return render_tag(
+        tag, attrs=attrs, content=text_concat(
+            icon_content, content, separator=' '))
 
 
-def render_field_and_label(field, label, field_class='', label_for=None, label_class='', layout='', **kwargs):
+def render_field_and_label(
+        field, label, field_class='', label_for=None, label_class='',
+        layout='', **kwargs):
     """
     Render a field with its label
     """
@@ -115,9 +130,11 @@ def render_field_and_label(field, label, field_class='', label_for=None, label_c
         label_class = add_css_class(label_class, 'control-label')
     html = field
     if field_class:
-        html = '<div class="{klass}">{html}</div>'.format(klass=field_class, html=html)
+        html = '<div class="{klass}">{html}</div>'.format(
+            klass=field_class, html=html)
     if label:
-        html = render_label(label, label_for=label_for, label_class=label_class) + html
+        html = render_label(
+            label, label_for=label_for, label_class=label_class) + html
     return html
 
 
@@ -139,7 +156,10 @@ def is_widget_required_attribute(widget):
         return False
     if not widget.is_required:
         return False
-    if isinstance(widget, (AdminFileWidget, HiddenInput, FileInput, CheckboxSelectMultiple)):
+    if isinstance(
+            widget, (
+                AdminFileWidget, HiddenInput, FileInput,
+                CheckboxSelectMultiple)):
         return False
     return True
 
@@ -151,4 +171,3 @@ def is_widget_with_placeholder(widget):
     These are all derived form TextInput, except for Textarea
     """
     return isinstance(widget, (TextInput, Textarea))
-

bootstrap3/html.py

@@ -22,7 +22,8 @@ def add_css_class(css_classes, css_class, prepend=False):
     Add a CSS class to a string of CSS classes
     """
     classes_list = split_css_classes(css_classes)
-    classes_to_add = [c for c in split_css_classes(css_class) if c not in classes_list]
+    classes_to_add = [c for c in split_css_classes(css_class)
+                      if c not in classes_list]
     if prepend:
         classes_list = classes_to_add + classes_list
     else:
@@ -35,15 +36,19 @@ def remove_css_class(css_classes, css_class):
     Remove a CSS class from a string of CSS classes
     """
     remove = set(split_css_classes(css_class))
-    classes_list = [c for c in split_css_classes(css_classes) if c not in remove]
+    classes_list = [c for c in split_css_classes(css_classes)
+                    if c not in remove]
     return ' '.join(classes_list)
 
 
 def render_link_tag(url, rel='stylesheet', media='all'):
     """
     Build a link tag
     """
-    return render_tag('link', attrs={'href': url, 'rel': rel, 'media': media}, close=False)
+    return render_tag(
+        'link',
+        attrs={'href': url, 'rel': rel, 'media': media},
+        close=False)
 
 
 def render_tag(tag, attrs=None, content=None, close=True):