Fix Python3 issue zostera#78

Author: dyve

bootstrap3/__init__.py

@@ -1 +1 @@
-__version__ = '2.6.0'
+__version__ = '2.6.1'

bootstrap3/templatetags/bootstrap3.py

@@ -1,16 +1,15 @@
-# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 import re
 from math import floor
 
 from django import template
 from django.template.loader import get_template
+from django.utils.encoding import force_text
 
 from ..bootstrap import css_url, javascript_url, jquery_url
-from ..forms import (render_button, render_field, render_field_and_label,
-                     render_form, render_form_group, render_formset,
-                     render_label)
+from ..forms import render_button, render_field, render_field_and_label, render_form, render_form_group, render_formset, \
+    render_label
 from ..icons import render_icon
 from ..templates import handle_var, parse_token_contents
 
@@ -470,19 +469,19 @@ def get_pagination_context(page, pages_to_show=11,
         # Append proper character to url
     if url:
         # Remove existing page GET parameters
-        url = unicode(url)
+        url = force_text(url)
         url = re.sub(r'\?page\=[^\&]+', '?', url)
         url = re.sub(r'\&page\=[^\&]+', '', url)
         # Append proper separator
         if '?' in url:
             url += '&'
         else:
             url += '?'
-        # Append extra string to url
+            # Append extra string to url
     if extra:
         if not url:
             url = '?'
-        url += unicode(extra) + '&'
+        url += force_text(extra) + '&'
     if url:
         url = url.replace('?&', '?')
     # Set CSS classes,see twitter.github.io/bootstrap/components.html#pagination