Merge pull request #176 from bikeshedder/patch-1

Fix deprecation warning introduced in Django 1.7
This commit is contained in:
Piotr Maliński 2015-04-16 16:02:38 +02:00
commit d15090bd92
1 changed files with 6 additions and 1 deletions

View File

@ -7,7 +7,12 @@ from django.utils.html import conditional_escape
from django.utils.encoding import force_text
from django.utils.translation import get_language
from django.core.exceptions import ImproperlyConfigured
from django.forms.util import flatatt
try:
# Django >=1.7
from django.forms.utils import flatatt
except ImportError:
# Django <1.7
from django.forms.util import flatatt
from django.utils.functional import Promise
from django.utils.encoding import force_text