From: Jan Szejko Date: Tue, 14 Feb 2017 13:32:00 +0000 (+0100) Subject: fix django 1.9 compatibility X-Git-Tag: 0.2.3~1 X-Git-Url: https://git.mdrn.pl/fnpdjango.git/commitdiff_plain/02524a5492bf3a45585346ef7d989e7b823059c0?ds=sidebyside fix django 1.9 compatibility --- diff --git a/.gitignore b/.gitignore index 39ece65..06194e4 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,10 @@ dist .tox /htmlcov +# PyCharm garbage +.idea +.pycharmrc + # Mac OS X garbage .DS_Store diff --git a/fnpdjango/templatetags/macros.py b/fnpdjango/templatetags/macros.py index 61b007d..647843d 100644 --- a/fnpdjango/templatetags/macros.py +++ b/fnpdjango/templatetags/macros.py @@ -52,7 +52,7 @@ through {% extends ... %} tags. """ from django import template -from django.template import FilterExpression +from django.template.base import FilterExpression from django.template.loader import get_template import re