Merge pull request #29 from encolpe/django-1.9

Remove ConstantIncludeNode as it was removed in django 1.7
renyi · Feb 29, 2016 · dfc3fdc · dfc3fdc
2 parents 1b117c1 + 521c64c
commit dfc3fdc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/mezzanine_themes/business/templatetags/include_strip.py b/mezzanine_themes/business/templatetags/include_strip.py
@@ -2,22 +2,15 @@
 register = template.Library()
 
 from django.template.loader_tags import do_include
-from django.template.loader_tags import ConstantIncludeNode, IncludeNode
-
-class StripConstantIncludeNode(ConstantIncludeNode):
-    def render(self, context):
-        return super(StripConstantIncludeNode, self).render(context).strip()
+from django.template.loader_tags import IncludeNode
 
 class StripIncludeNode(IncludeNode):
     def render(self, context):
         return super(StripIncludeNode, self).render(context).strip()
 
 def do_include_strip(parser, token):
     result = do_include(parser, token)
-    if isinstance(result, ConstantIncludeNode):
-        result.__class__ = StripConstantIncludeNode
-    elif isinstance(result, IncludeNode):
-        result.__class__ = StripIncludeNode
+    result.__class__ = StripIncludeNode
     return result
 
 register.tag('include_strip', do_include_strip)
diff --git a/mezzanine_themes/classic/templatetags/include_strip.py b/mezzanine_themes/classic/templatetags/include_strip.py
@@ -2,22 +2,15 @@
 register = template.Library()
 
 from django.template.loader_tags import do_include
-from django.template.loader_tags import ConstantIncludeNode, IncludeNode
-
-class StripConstantIncludeNode(ConstantIncludeNode):
-    def render(self, context):
-        return super(StripConstantIncludeNode, self).render(context).strip()
+from django.template.loader_tags import IncludeNode
 
 class StripIncludeNode(IncludeNode):
     def render(self, context):
         return super(StripIncludeNode, self).render(context).strip()
 
 def do_include_strip(parser, token):
     result = do_include(parser, token)
-    if isinstance(result, ConstantIncludeNode):
-        result.__class__ = StripConstantIncludeNode
-    elif isinstance(result, IncludeNode):
-        result.__class__ = StripIncludeNode
+    result.__class__ = StripIncludeNode
     return result
 
 register.tag('include_strip', do_include_strip)