From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 30 Mar 2015 14:54:33 +0000 (+0200)
Subject: in prevision of django-1.7, locate add_to_builtins
X-Git-Tag: myslice-1.3~45^2~5^2~2
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=da026efdfa0421d8fddc77c2afb509a4fe4f1a8c

in prevision of django-1.7, locate add_to_builtins
---

diff --git a/myslice/urls.py b/myslice/urls.py
index 0d0e1cce..631c15ef 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -12,7 +12,12 @@ import components
 # admin.autodiscover()
 
 # to enable insert_above stuff
-from django.template.loader import add_to_builtins
+# add_to_builtins has changed location with django-1.7
+# also note this will probably go away some day
+try:
+    from django.template.loader import add_to_builtins
+except:
+    from django.template.base import add_to_builtins
 add_to_builtins('insert_above.templatetags.insert_tags')
 
 from settings import auxiliaries, INSTALLED_APPS