Merge branch 'hanuprateek/django-jet:master' into deprecated-messages

Merge branch 'deprecated-messages' into dev

jet/dashboard/dashboard.py

@@ -3,10 +3,13 @@ from django.core.urlresolvers import reverse
 from django.template.loader import render_to_string
 from jet.dashboard import modules
 from jet.dashboard.models import UserDashboardModule
-from django.core.context_processors import csrf
 from django.utils.translation import ugettext_lazy as _
 from jet.ordered_set import OrderedSet
 from jet.utils import get_admin_site_name
+try:
+    from django.template.context_processors import csrf
+except ImportError:
+    from django.core.context_processors import csrf
 
 
 class Dashboard(object):

jet/dashboard/urls.py

@@ -1,3 +1,4 @@
+import django
 from django.conf.urls import patterns, url
 from django.views.i18n import javascript_catalog
 from jet.dashboard import dashboard
@@ -5,8 +6,7 @@ from jet.dashboard.views import update_dashboard_modules_view, add_user_dashboar
     update_dashboard_module_collapse_view, remove_dashboard_module_view, UpdateDashboardModuleView, \
     load_dashboard_module_view, reset_dashboard_view
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(
         r'^module/(?P<pk>\d+)/$',
         UpdateDashboardModuleView.as_view(),
@@ -48,6 +48,9 @@ urlpatterns = patterns(
         {'packages': ('jet',)},
         name='jsi18n'
     ),
-)
+]
 
 urlpatterns += dashboard.urls.get_urls()
+
+if django.VERSION[:2] < (1, 8):
+    urlpatterns = patterns('', *urlpatterns)

jet/urls.py

@@ -1,9 +1,9 @@
+import django
 from django.conf.urls import patterns, url
 from django.views.i18n import javascript_catalog
 from jet.views import add_bookmark_view, remove_bookmark_view, toggle_application_pin_view, model_lookup_view
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(
         r'^add_bookmark/$',
         add_bookmark_view,
@@ -30,4 +30,7 @@ urlpatterns = patterns(
         {'packages': ('django.conf', 'django.contrib.admin', 'jet',)},
         name='jsi18n'
     ),
-)
+]
+
+if django.VERSION[:2] < (1, 8):
+    urlpatterns = patterns('', *urlpatterns)