Merge branch 'savvymx-develop' into develop

Author: bashu

maintenancemode/middleware.py

@@ -4,8 +4,13 @@
 import django
 
 from django.conf import urls
-from django.core import urlresolvers
-
+from django.urls import get_resolver
+try:
+    from django.utils.deprecation import MiddlewareMixin
+except ImportError:
+    # Compatibility for older version of Django
+    MiddlewareMixin = object
+    
 from .conf import settings
 from . import utils as maintenance
 from django.utils.deprecation import MiddlewareMixin
@@ -53,7 +58,7 @@ def process_request(self, request):
                 return None
 
         # Otherwise show the user the 503 page
-        resolver = urlresolvers.get_resolver(None)
+        resolver = get_resolver(None)
 
         if django.VERSION < (1, 8):
             callback, param_dict = resolver._resolve_special('503')