From 16fb63da83be0d9c41e75a3aeab2947e35fb142c Mon Sep 17 00:00:00 2001 From: Matt Briancon Date: Sun, 21 May 2017 15:37:00 -0400 Subject: [PATCH 1/2] Fix Django deprecation warning --- rollbar/contrib/django/middleware.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rollbar/contrib/django/middleware.py b/rollbar/contrib/django/middleware.py index b2618da4..d4a1a67a 100644 --- a/rollbar/contrib/django/middleware.py +++ b/rollbar/contrib/django/middleware.py @@ -18,11 +18,16 @@ import rollbar +import django from django.core.exceptions import MiddlewareNotUsed -from django.core.urlresolvers import resolve from django.conf import settings from django.http import Http404 +if django.VERSION >= (1, 10): + from django.urls import resolve +else: + from django.core.urlresolvers import resolve + try: from django.utils.deprecation import MiddlewareMixin except ImportError: From 7b1b255d251c975e16f93bfa2727e847bd5a2da2 Mon Sep 17 00:00:00 2001 From: Matt Briancon Date: Tue, 23 May 2017 10:03:50 -0400 Subject: [PATCH 2/2] Use try/except on ImportError --- rollbar/contrib/django/middleware.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rollbar/contrib/django/middleware.py b/rollbar/contrib/django/middleware.py index d4a1a67a..7cb00cc2 100644 --- a/rollbar/contrib/django/middleware.py +++ b/rollbar/contrib/django/middleware.py @@ -18,14 +18,13 @@ import rollbar -import django from django.core.exceptions import MiddlewareNotUsed from django.conf import settings from django.http import Http404 -if django.VERSION >= (1, 10): +try: from django.urls import resolve -else: +except ImportError: from django.core.urlresolvers import resolve try: