git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
in prevision of django-1.7, locate add_to_builtins
[unfold.git]
/
myslice
/
urls.py
diff --git
a/myslice/urls.py
b/myslice/urls.py
index
0d0e1cc
..
631c15e
100644
(file)
--- a/
myslice/urls.py
+++ b/
myslice/urls.py
@@
-12,7
+12,12
@@
import components
# admin.autodiscover()
# to enable insert_above stuff
# 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
add_to_builtins('insert_above.templatetags.insert_tags')
from settings import auxiliaries, INSTALLED_APPS