Merge pull request #6 from ahmedaljazzar/enhancements/url-resolver

Supporting Django 2.0 reverse function

Author: iamjazzar

djangomako/backends.py

@@ -10,14 +10,16 @@
 
 import tempfile
 
-from django.core.urlresolvers import reverse
+from django import get_version
 from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.template import TemplateDoesNotExist, TemplateSyntaxError
 from django.template.backends.base import BaseEngine
-from django.template.backends.utils import csrf_input_lazy, \
-    csrf_token_lazy
-
+from django.template.backends.utils import (
+    csrf_input_lazy,
+    csrf_token_lazy,
+)
 from django.utils.module_loading import import_string
+
 from mako.template import Template as MakoTemplate
 from mako import exceptions as mako_exceptions
 
@@ -151,6 +153,9 @@ def render(self, context=None, request=None):
         if context is None:
             context = {}
 
+        context['static'] = static
+        context['url'] = self.get_reverse_url()
+
         if request is not None:
             # As Django doesn't have a global request object,
             # it's useful to put it in the context.
@@ -159,7 +164,13 @@ def render(self, context=None, request=None):
             context['csrf_input'] = csrf_input_lazy(request)
             context['csrf_token'] = csrf_token_lazy(request)
 
-            context['static'] = static
-            context['url'] = reverse
-
         return self.template.render(**context)
+
+    @staticmethod
+    def get_reverse_url():
+        if get_version() < '2.0':
+            from django.core.urlresolvers import reverse
+        else:
+            from django.urls import reverse
+
+        return reverse

niceapp/views.py

@@ -38,7 +38,7 @@ def get_template_names(self):
     def get_context_data(self, **kwargs):
         context = super(ClassBasedView, self).get_context_data(**kwargs)
         engine = kwargs['engine']
-
+        print context
         context.update({
             'items': [
                 'Wow',

templates/django.html

@@ -15,11 +15,11 @@
         generated.
     </p>
     <p>
-       The home url for the CBV is:  <i><strong>{% url 'CBV' %}</strong></i>
+       The home url for the CBV is:  <a href="{% url 'CBV' %}">{% url 'CBV' %}</a>
     </p>
     <p>
         The request object is <i><strong>{{ request }}</strong></i>
     </p>
 </body>
 
-</html>
+</html>

templates/mako.html

@@ -18,12 +18,12 @@
         Your CSRF Token is: <i><strong>${ csrf_token }</strong></i>
     </p>
     <p>
-        The home url for the CBV is: <i><strong>${ url('CBV') }</strong></i>
+        The home url for the CBV is: <a href="${ url('CBV') }">${ url('CBV') }</a>
     </p>
     <p>
         The request body is <i><strong>${ request.body }</strong></i>
     </p>
 
 </body>
 
-</html>
+</html>