From 42fbf8ad888486781262e74f44dff9bf0f01699c Mon Sep 17 00:00:00 2001 From: Andrew Somerville Date: Tue, 3 Feb 2015 19:55:10 -0500 Subject: [PATCH 1/2] unbreak django.forms.util(s) import for django < 1.7 --- bootstrap3_datetime/widgets.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bootstrap3_datetime/widgets.py b/bootstrap3_datetime/widgets.py index 95338de..c19a6ca 100644 --- a/bootstrap3_datetime/widgets.py +++ b/bootstrap3_datetime/widgets.py @@ -1,5 +1,9 @@ # -*- coding: utf-8 -*- -from django.forms.utils import flatatt +import django +if django.VERSION >= (1,9): + from django.forms.utils import flatatt +else: + from django.forms.util import flatatt from django.forms.widgets import DateTimeInput from django.utils import translation from django.utils.safestring import mark_safe From cc22c145c348af441c39471021ee752978ed7624 Mon Sep 17 00:00:00 2001 From: Andrew Somerville Date: Fri, 23 Oct 2015 16:54:20 -0400 Subject: [PATCH 2/2] use new import path to eliminate deprication warnings --- bootstrap3_datetime/widgets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap3_datetime/widgets.py b/bootstrap3_datetime/widgets.py index c19a6ca..229415e 100644 --- a/bootstrap3_datetime/widgets.py +++ b/bootstrap3_datetime/widgets.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import django -if django.VERSION >= (1,9): +if django.VERSION >= (1,7): from django.forms.utils import flatatt else: from django.forms.util import flatatt