Merge pull request #176 from bikeshedder/patch-1
Fix deprecation warning introduced in Django 1.7
This commit is contained in:
commit
d15090bd92
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue