From 7d783ad368b093de1635d9c8649e6506ef7ea12d Mon Sep 17 00:00:00 2001 From: Hugo Leonardo Costa e Silva Date: Wed, 6 Apr 2016 15:11:37 -0300 Subject: [PATCH 1/2] adding tox enviroment dj19 --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index ecd0123..52bff21 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {py27,py34}-dj{15,16,17,18} +envlist = {py27,py34}-dj{15,16,17,18,19} skipsdist=True @@ -13,6 +13,7 @@ deps = dj16: django>=1.6,<1.7 dj17: django>=1.7,<1.8 dj18: django>=1.8,<1.9 + dj19: django>=1.9,<1.10 commands = python setup.py test From 7f97ef6b0d8a31a730650395a90c65e2f24e9cb2 Mon Sep 17 00:00:00 2001 From: Hugo Leonardo Costa e Silva Date: Wed, 6 Apr 2016 15:24:25 -0300 Subject: [PATCH 2/2] Fixing: Deprecation warnings when used with Django 1.9 --- bootstrapform/templatetags/bootstrap.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bootstrapform/templatetags/bootstrap.py b/bootstrapform/templatetags/bootstrap.py index a8b96de..c720db8 100644 --- a/bootstrapform/templatetags/bootstrap.py +++ b/bootstrapform/templatetags/bootstrap.py @@ -1,4 +1,4 @@ -from django import forms +from django import forms, VERSION as django_version from django.template import Context from django.template.loader import get_template from django import template @@ -77,6 +77,9 @@ def render(element, markup_classes): template = get_template("bootstrapform/form.html") context = Context({'form': element, 'classes': markup_classes}) + if django_version >= (1, 8): + context = context.flatten() + return template.render(context)