Django 1.11 compatibility fixes.

[django-ssify.git] / ssify / decorators.py

diff --git a/ssify/decorators.py b/ssify/decorators.py
index b513dbe..1e2d62a 100644 (file)
--- a/ssify/decorators.py
+++ b/ssify/decorators.py
@@ -11,7 +11,12 @@ from inspect import getargspec
 import warnings
 from django.conf import settings
 from django.http import Http404
-from django.template.base import parse_bits
+try:
+    # Django 1.9
+    from django.template.library import parse_bits
+except ImportError:
+    from django.template.base import parse_bits
+
 from django.utils.translation import get_language, activate
 from .cache import cache_include, DEFAULT_TIMEOUT
 from . import exceptions
@@ -56,7 +61,7 @@ def ssi_included(view=None, use_lang=True,
                 request._cache_update_cache = False
 
                 def _check_included_vars(response):
-                    used_vars = request.ssi_vars_needed
+                    used_vars = getattr(request, 'ssi_vars_needed', {})
                     if get_ssi_vars:
                         # Remove the ssi vars that should be provided
                         # by the including view.