Merge lp:~roadmr/canonical-identity-provider/fix-deprecation-warnings-3 into lp:canonical-identity-provider/release

[Daniel Manrique]

Fix most remaining Django and Python deprecation warnings in the sso codebase itself.

Some of the remaining ones probably need fixing in dependencies:
- django-statsd
- django-openid-auth
- django-piston
- django-honeypot
- raven
- preflight
- oauthlib

Other than the ones from dependencies, the remaining deprecation warnings are:

- most of the middlewares. RemovedInDjango20Warning: Old-style middleware using settings.MIDDLEWARE_CLASSES is deprecated. Update your middleware and use settings.MIDDLEWARE instead.
- identityprovider/models/twofactor.py:103: RemovedInDjango20Warning: Using user.is_authenticated() and user.is_anonymous() as a method is deprecated. Remove the parentheses to use it as an attribute. This needs updating django-openid-auth to make its is_authenticated method an attribute, to avoid ugly "is it callable?" logic in SSO itself.

Fix most remaining Django and Python deprecation warnings in the sso codebase itself.

Some of the remaining ones probably need fixing in dependencies:
- django-statsd
- django-openid-auth
- django-piston
- django-honeypot
- raven
- preflight
- oauthlib

Other than the ones from dependencies, the remaining deprecation warnings are:

- most of the middlewares. RemovedInDjango20Warning: Old-style middleware using settings.MIDDLEWARE_CLASSES is deprecated. Update your middleware and use settings.MIDDLEWARE instead.
- identityprovider/models/twofactor.py:103: RemovedInDjango20Warning: Using user.is_authenticated() and user.is_anonymous() as a method is deprecated. Remove the parentheses to use it as an attribute. This needs updating django-openid-auth to make its is_authenticated method an attribute, to avoid ugly "is it callable?" logic in SSO itself.

[Maximiliano Bertacchini (maxiberta)]

+1, thanks!

review: Approve

=== modified file 'src/api/v10/tests/test_handlers.py'
--- src/api/v10/tests/test_handlers.py	2018-02-09 20:56:16 +0000
+++ src/api/v10/tests/test_handlers.py	2018-05-30 16:21:15 +0000
@@ -9,8 +9,8 @@
 
 from django.conf import settings
 from django.core import mail
-from django.core.urlresolvers import reverse
 from django.test.utils import override_settings
+from django.urls import reverse
 from django.utils.http import urlencode
 from django.utils.timezone import now
 from gargoyle.testutils import switches

=== modified file 'src/api/v20/tests/test_auth.py'
--- src/api/v20/tests/test_auth.py	2018-02-09 20:56:16 +0000
+++ src/api/v20/tests/test_auth.py	2018-05-30 16:21:15 +0000
@@ -5,8 +5,8 @@
 import json
 from urllib import urlencode
 
-from django.core.urlresolvers import reverse
 from django.test.client import RequestFactory
+from django.urls import reverse
 from piston.handler import AnonymousBaseHandler
 from piston.resource import Resource
 

=== modified file 'src/api/v20/tests/test_decorators.py'
--- src/api/v20/tests/test_decorators.py	2018-02-14 14:05:59 +0000
+++ src/api/v20/tests/test_decorators.py	2018-05-30 16:21:15 +0000
@@ -4,8 +4,8 @@
 
 from django.conf.urls import url
 from django.core.cache import cache
-from django.core.urlresolvers import reverse
 from django.test import override_settings
+from django.urls import reverse
 from memcache import Client
 from piston.handler import BaseHandler
 from piston.resource import Resource

=== modified file 'src/api/v20/tests/test_handlers.py'
--- src/api/v20/tests/test_handlers.py	2018-02-14 14:05:59 +0000
+++ src/api/v20/tests/test_handlers.py	2018-05-30 16:21:15 +0000
@@ -16,9 +16,10 @@
 from django.contrib.auth.models import AnonymousUser
 from django.core import mail
 from django.core.serializers.json import DjangoJSONEncoder
-from django.core.urlresolvers import NoReverseMatch, reverse
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
+from django.urls import reverse
+from django.urls.exceptions import NoReverseMatch
 from django.utils.timezone import now
 from gargoyle.testutils import switches
 from mock import Mock, patch

=== modified file 'src/api/v20/tests/test_login.py'
--- src/api/v20/tests/test_login.py	2018-02-21 11:59:00 +0000
+++ src/api/v20/tests/test_login.py	2018-05-30 16:21:15 +0000
@@ -2,7 +2,7 @@
 
 from django.contrib.auth.hashers import make_password
 from django.core.serializers.json import DjangoJSONEncoder
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.timezone import now
 from timeline import Timeline
 

=== modified file 'src/api/v20/tests/test_urls.py'
--- src/api/v20/tests/test_urls.py	2016-06-08 05:03:11 +0000
+++ src/api/v20/tests/test_urls.py	2018-05-30 16:21:15 +0000
@@ -1,4 +1,5 @@
-from django.core.urlresolvers import resolve, reverse
+from django.urls import reverse
+from django.urls.base import resolve
 from piston.authentication import NoAuthentication
 
 from api.v20 import auth, handlers

=== modified file 'src/api/v20/tests/test_utils.py'
--- src/api/v20/tests/test_utils.py	2018-01-27 13:11:38 +0000
+++ src/api/v20/tests/test_utils.py	2018-05-30 16:21:15 +0000
@@ -3,7 +3,7 @@
 from functools import partial
 from operator import attrgetter
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from api.v20.utils import (
     EnsureJSONResponseOnAPIErrorMiddleware,

=== modified file 'src/api/v20/utils.py'
--- src/api/v20/utils.py	2018-02-09 14:17:25 +0000
+++ src/api/v20/utils.py	2018-05-30 16:21:15 +0000
@@ -4,8 +4,8 @@
 import json
 from operator import attrgetter
 
-from django.core.urlresolvers import reverse
 from django.http import HttpResponse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from identityprovider.models.account import Account

=== modified file 'src/identityprovider/admin.py'
--- src/identityprovider/admin.py	2018-05-29 17:14:24 +0000
+++ src/identityprovider/admin.py	2018-05-30 16:21:15 +0000
@@ -14,10 +14,10 @@
 from django.contrib.auth.hashers import make_password
 from django.contrib.auth.models import User
 from django.core import validators
-from django.core.urlresolvers import reverse
 from django.db import connections
 from django.db.models.query import QuerySet
 from django.template.defaultfilters import force_escape
+from django.urls import reverse
 from django.utils.html import format_html
 from oauth_backend.models import Consumer as V1Consumer, Token as V1Token
 

=== modified file 'src/identityprovider/emailutils.py'
--- src/identityprovider/emailutils.py	2018-04-04 15:35:18 +0000
+++ src/identityprovider/emailutils.py	2018-05-30 16:21:15 +0000
@@ -6,8 +6,8 @@
 
 from django.conf import settings
 from django.core.mail import send_mail
-from django.core.urlresolvers import reverse
 from django.template.loader import render_to_string
+from django.urls import reverse
 from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
 

=== modified file 'src/identityprovider/forms.py'
--- src/identityprovider/forms.py	2018-05-25 21:47:30 +0000
+++ src/identityprovider/forms.py	2018-05-30 16:21:15 +0000
@@ -6,8 +6,8 @@
 
 from django import forms
 from django.conf import settings
-from django.core.urlresolvers import reverse
 from django.forms import Form, fields, widgets
+from django.urls import reverse
 from django.utils import translation
 from django.utils.translation import ugettext_lazy as _
 from gargoyle import gargoyle

=== modified file 'src/identityprovider/middleware/useraccount.py'
--- src/identityprovider/middleware/useraccount.py	2016-06-08 17:05:05 +0000
+++ src/identityprovider/middleware/useraccount.py	2018-05-30 16:21:15 +0000
@@ -41,7 +41,7 @@
                 logout(request)
 
     def process_request(self, request):
-        if request.user.is_authenticated():
+        if request.user.is_authenticated:
             is_admin_url = self.is_admin_area(request.get_full_path())
             if isinstance(request.user, User) and not is_admin_url:
                 try:

=== modified file 'src/identityprovider/middleware/xrds.py'
--- src/identityprovider/middleware/xrds.py	2018-02-09 20:56:16 +0000
+++ src/identityprovider/middleware/xrds.py	2018-05-30 16:21:15 +0000
@@ -3,10 +3,11 @@
 
 from urlparse import urlparse
 
-from django.core.urlresolvers import resolve, reverse
 from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404
 from django.template.loader import render_to_string
+from django.urls import reverse
+from django.urls.base import resolve
 
 from openid.yadis.accept import getAcceptable
 from openid.yadis.constants import YADIS_CONTENT_TYPE, YADIS_HEADER_NAME

=== modified file 'src/identityprovider/models/authtoken.py'
--- src/identityprovider/models/authtoken.py	2018-05-25 16:27:25 +0000
+++ src/identityprovider/models/authtoken.py	2018-05-30 16:21:15 +0000
@@ -8,10 +8,10 @@
 
 from hashlib import sha256
 
-from django.core.urlresolvers import reverse
 from django.core.validators import validate_email
 from django.db import models
 from django.http import Http404
+from django.urls import reverse
 from django.utils.timezone import now
 
 from identityprovider.models.account import (

=== modified file 'src/identityprovider/tests/helpers.py'
--- src/identityprovider/tests/helpers.py	2018-02-20 17:13:36 +0000
+++ src/identityprovider/tests/helpers.py	2018-05-30 16:21:15 +0000
@@ -7,7 +7,7 @@
 
 from django.contrib.auth.models import User
 from django.core import mail
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from openid import fetchers
 from openid.consumer.consumer import Consumer
 from openid.consumer.discover import (

=== modified file 'src/identityprovider/tests/openid_server/per_version/test_logout_during_login.py'
--- src/identityprovider/tests/openid_server/per_version/test_logout_during_login.py	2013-11-12 15:30:36 +0000
+++ src/identityprovider/tests/openid_server/per_version/test_logout_during_login.py	2018-05-30 16:21:15 +0000
@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from identityprovider.tests.helpers import OpenIDTestCase
 

=== modified file 'src/identityprovider/tests/openid_server/per_version/test_sso_workflow_authorize.py'
--- src/identityprovider/tests/openid_server/per_version/test_sso_workflow_authorize.py	2013-04-01 15:24:48 +0000
+++ src/identityprovider/tests/openid_server/per_version/test_sso_workflow_authorize.py	2018-05-30 16:21:15 +0000
@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from identityprovider.models import OpenIDRPSummary
 from identityprovider.tests.helpers import OpenIDTestCase

=== modified file 'src/identityprovider/tests/sso_server/test_standalone_login.py'
--- src/identityprovider/tests/sso_server/test_standalone_login.py	2018-02-09 20:56:16 +0000
+++ src/identityprovider/tests/sso_server/test_standalone_login.py	2018-05-30 16:21:15 +0000
@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from identityprovider.models.account import Account
 from identityprovider.tests import DEFAULT_USER_PASSWORD

=== modified file 'src/identityprovider/tests/test_admin.py'
--- src/identityprovider/tests/test_admin.py	2018-05-29 17:14:24 +0000
+++ src/identityprovider/tests/test_admin.py	2018-05-30 16:21:15 +0000
@@ -14,8 +14,8 @@
 )
 from django.contrib.auth.hashers import check_password
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
 from django.db import connections
+from django.urls import reverse
 from django.utils.dateformat import format
 from django.utils.timezone import now
 from mock import MagicMock, Mock, patch

=== modified file 'src/identityprovider/tests/test_emailutils.py'
--- src/identityprovider/tests/test_emailutils.py	2017-05-09 18:02:49 +0000
+++ src/identityprovider/tests/test_emailutils.py	2018-05-30 16:21:15 +0000
@@ -8,9 +8,9 @@
 
 from django.conf import settings
 from django.core import mail
-from django.core.urlresolvers import reverse
 from django.template.loader import render_to_string
 from django.test.utils import override_settings
+from django.urls import reverse
 from django.utils.timezone import now
 from mock import patch
 

=== modified file 'src/identityprovider/tests/test_models_authtoken.py'
--- src/identityprovider/tests/test_models_authtoken.py	2018-02-09 20:56:16 +0000
+++ src/identityprovider/tests/test_models_authtoken.py	2018-05-30 16:21:15 +0000
@@ -6,9 +6,9 @@
 
 from django.conf import settings
 from django.core.exceptions import MultipleObjectsReturned, ValidationError
-from django.core.urlresolvers import reverse
 from django.http import Http404
 from django.test.utils import override_settings
+from django.urls import reverse
 from django.utils.timezone import now
 from mock import patch
 

=== modified file 'src/identityprovider/tests/test_readonly.py'
--- src/identityprovider/tests/test_readonly.py	2018-02-09 20:56:16 +0000
+++ src/identityprovider/tests/test_readonly.py	2018-05-30 16:21:15 +0000
@@ -10,7 +10,7 @@
 import requests
 import responses
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from identityprovider.readonly import (
     ReadOnlyManager,

=== modified file 'src/identityprovider/tests/test_signals.py'
--- src/identityprovider/tests/test_signals.py	2018-01-23 17:51:11 +0000
+++ src/identityprovider/tests/test_signals.py	2018-05-30 16:21:15 +0000
@@ -5,11 +5,11 @@
 
 from django.conf import settings
 from django.contrib.auth.signals import user_logged_in
-from django.core.urlresolvers import reverse
 from django.db.models.signals import (
     post_save,
     pre_delete,
 )
+from django.urls import reverse
 from django.utils.timezone import now
 
 from mock import Mock, patch

=== modified file 'src/identityprovider/tests/test_views_server.py'
--- src/identityprovider/tests/test_views_server.py	2018-02-20 17:12:17 +0000
+++ src/identityprovider/tests/test_views_server.py	2018-05-30 16:21:15 +0000
@@ -12,9 +12,9 @@
 from django.contrib import messages
 from django.contrib.auth.models import AnonymousUser
 from django.core.cache import cache
-from django.core.urlresolvers import reverse
 from django.http import HttpRequest
 from django.test.utils import override_settings, patch_logger
+from django.urls import reverse
 from django.utils.timezone import now
 from gargoyle.testutils import switches
 from mock import Mock

=== modified file 'src/identityprovider/tests/test_views_testing.py'
--- src/identityprovider/tests/test_views_testing.py	2018-02-09 20:56:16 +0000
+++ src/identityprovider/tests/test_views_testing.py	2018-05-30 16:21:15 +0000
@@ -2,8 +2,8 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
 from django.test.utils import patch_logger
+from django.urls import reverse
 
 from identityprovider.tests.utils import SSOBaseTestCase
 from identityprovider.views.testing import (

=== modified file 'src/identityprovider/tests/test_xrds.py'
--- src/identityprovider/tests/test_xrds.py	2018-02-09 20:56:16 +0000
+++ src/identityprovider/tests/test_xrds.py	2018-05-30 16:21:15 +0000
@@ -1,8 +1,8 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from django.core.urlresolvers import reverse
 from django.test.utils import override_settings, patch_logger
+from django.urls import reverse
 
 from identityprovider.tests.utils import SSOBaseTestCase
 

=== modified file 'src/identityprovider/utils.py'
--- src/identityprovider/utils.py	2018-01-27 13:11:38 +0000
+++ src/identityprovider/utils.py	2018-05-30 16:21:15 +0000
@@ -15,9 +15,9 @@
 from django.conf import settings
 from django.contrib.sessions.models import Session
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.urlresolvers import reverse
 from django.db import connection, transaction
 from django.db.utils import ProgrammingError
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 SALT_LENGTH = 20

=== modified file 'src/identityprovider/views/server.py'
--- src/identityprovider/views/server.py	2018-05-25 20:41:26 +0000
+++ src/identityprovider/views/server.py	2018-05-30 16:21:15 +0000
@@ -10,7 +10,6 @@
 
 from django.conf import settings
 from django.contrib import auth, messages
-from django.core.urlresolvers import reverse
 from django.http import (
     Http404,
     HttpResponse,
@@ -20,6 +19,7 @@
 )
 from django.shortcuts import get_object_or_404, render
 from django.template import loader
+from django.urls import reverse
 from django.utils import translation
 from django.utils.decorators import decorator_from_middleware
 from django.utils.timezone import now

=== modified file 'src/identityprovider/widgets.py'
--- src/identityprovider/widgets.py	2018-05-28 17:05:47 +0000
+++ src/identityprovider/widgets.py	2018-05-30 16:21:15 +0000
@@ -30,15 +30,16 @@
 
 
 class ROAwareTextInput(TextInput):
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, attrs=None, renderer=None):
         if settings.READ_ONLY_MODE:
             return read_only_markup(value)
         else:
-            return super(ROAwareTextInput, self).render(name, value, attrs)
+            return super(ROAwareTextInput, self).render(
+                name, value, attrs, renderer)
 
 
 class ROAwareSelect(Select):
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, attrs=None, renderer=None):
         if settings.READ_ONLY_MODE:
             label = ''
             for option_value, option_label in self.choices:
@@ -47,11 +48,12 @@
                     break
             return read_only_markup(label)
         else:
-            return super(ROAwareSelect, self).render(name, value, attrs)
+            return super(ROAwareSelect, self).render(
+                name, value, attrs, renderer)
 
 
 class CommaSeparatedWidget(CheckboxSelectMultiple):
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, attrs=None, renderer=None):
         if value is None:
             value = ''
         if isinstance(value, list):
@@ -59,14 +61,14 @@
         else:
             vals = value.split(',')
         return super(CommaSeparatedWidget, self).render(
-            name, vals, attrs)
+            name, vals, attrs, renderer)
 
 
 class StatusWidget(Select):
     date_status_set = None
 
-    def render(self, name, value, attrs=None):
-        select = super(StatusWidget, self).render(name, value, attrs)
+    def render(self, name, value, attrs=None, renderer=None):
+        select = super(StatusWidget, self).render(name, value, attrs, renderer)
         if self.date_status_set:
             status_date = _("Set on %s") % self.date_status_set
         else:
@@ -77,12 +79,12 @@
 class ReadOnlyDateTimeWidget(Widget):
     value = None
 
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, attrs=None, renderer=None):
         return str(self.value)
 
 
 class LPUsernameWidget(Widget):
     account = None
 
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, attrs=None, renderer=None):
         return mark_safe_lazy(account_to_lp_link(self.account))

=== modified file 'src/ubuntu_sso_saml/tests/test_processors.py'
--- src/ubuntu_sso_saml/tests/test_processors.py	2018-04-16 16:32:22 +0000
+++ src/ubuntu_sso_saml/tests/test_processors.py	2018-05-30 16:21:15 +0000
@@ -10,9 +10,9 @@
 from StringIO import StringIO
 from xml.dom import minidom
 
-from django.core.urlresolvers import reverse
 from django.test.client import Client
 from django.test.utils import override_settings
+from django.urls import reverse
 from gargoyle.models import GLOBAL, Switch
 from gargoyle.testutils import switches
 from lxml import etree

=== modified file 'src/ubuntu_sso_saml/tests/test_views.py'
--- src/ubuntu_sso_saml/tests/test_views.py	2018-04-04 14:49:47 +0000
+++ src/ubuntu_sso_saml/tests/test_views.py	2018-05-30 16:21:15 +0000
@@ -1,6 +1,6 @@
 import copy
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from saml2idp import saml2idp_metadata
 
 from identityprovider.tests.utils import SSOBaseTestCase

=== modified file 'src/ubuntu_sso_saml/views.py'
--- src/ubuntu_sso_saml/views.py	2018-04-04 14:49:47 +0000
+++ src/ubuntu_sso_saml/views.py	2018-05-30 16:21:15 +0000
@@ -3,8 +3,8 @@
 import logging
 from urlparse import urlparse, urlunparse
 
-from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse
 from django.utils.datastructures import MultiValueDictKeyError
 from django.views.decorators.csrf import csrf_exempt
 from saml2idp import registry, saml2idp_metadata, xml_signing

=== modified file 'src/webui/decorators.py'
--- src/webui/decorators.py	2018-05-25 20:41:26 +0000
+++ src/webui/decorators.py	2018-05-30 16:21:15 +0000
@@ -16,7 +16,6 @@
 )
 from django.contrib.auth.views import redirect_to_login
 from django.core.cache import cache
-from django.core.urlresolvers import reverse
 from django.http import (
     Http404,
     HttpResponseForbidden,
@@ -24,6 +23,7 @@
 )
 from django.template.loader import render_to_string
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.utils.decorators import available_attrs
 from django.utils.http import (
     urlencode,

=== modified file 'src/webui/tests/test_decorators.py'
--- src/webui/tests/test_decorators.py	2017-10-04 19:52:55 +0000
+++ src/webui/tests/test_decorators.py	2018-05-30 16:21:15 +0000
@@ -4,11 +4,11 @@
 
 from django.conf import settings
 from django.contrib.auth.models import AnonymousUser
-from django.core.urlresolvers import reverse
 from django.http import (
     Http404,
     HttpResponseRedirect,
 )
+from django.urls import reverse
 from django.utils.timezone import now
 from gargoyle.testutils import switches
 
@@ -354,7 +354,7 @@
         self.assertEqual(self.calls, [])
         # user was logged out
         self.assertIsInstance(self.request.user, AnonymousUser)
-        self.assertFalse(self.request.user.is_authenticated())
+        self.assertFalse(self.request.user.is_authenticated)
 
 
 class SSOLoginRequiredNoEmailsTestCase(

=== modified file 'src/webui/tests/test_templates.py'
--- src/webui/tests/test_templates.py	2017-05-22 21:18:47 +0000
+++ src/webui/tests/test_templates.py	2018-05-30 16:21:15 +0000
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from django.core.urlresolvers import reverse
 from django.template.loader import render_to_string
+from django.urls import reverse
 from mock import patch
 from pyquery import PyQuery
 

=== modified file 'src/webui/tests/test_views_account.py'
--- src/webui/tests/test_views_account.py	2018-05-09 20:50:02 +0000
+++ src/webui/tests/test_views_account.py	2018-05-30 16:21:15 +0000
@@ -13,8 +13,9 @@
 from django.conf import settings
 from django.contrib.auth.hashers import check_password
 from django.core import mail
-from django.core.urlresolvers import NoReverseMatch, reverse
 from django.test.utils import override_settings
+from django.urls import reverse
+from django.urls.exceptions import NoReverseMatch
 from gargoyle.testutils import switches
 from pyquery import PyQuery
 

=== modified file 'src/webui/tests/test_views_account_ssh.py'
--- src/webui/tests/test_views_account_ssh.py	2018-02-08 15:12:52 +0000
+++ src/webui/tests/test_views_account_ssh.py	2018-05-30 16:21:15 +0000
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from gargoyle.testutils import switches
 from mock import call
 

=== modified file 'src/webui/tests/test_views_auth_log.py'
--- src/webui/tests/test_views_auth_log.py	2018-02-09 20:56:16 +0000
+++ src/webui/tests/test_views_auth_log.py	2018-05-30 16:21:15 +0000
@@ -5,7 +5,7 @@
 from __future__ import unicode_literals
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.timezone import now, timedelta
 
 from identityprovider.models.const import AuthLogType

=== modified file 'src/webui/tests/test_views_consumer.py'
--- src/webui/tests/test_views_consumer.py	2018-02-09 20:56:16 +0000
+++ src/webui/tests/test_views_consumer.py	2018-05-30 16:21:15 +0000
@@ -6,8 +6,8 @@
 
 from urllib import quote_plus
 
-from django.core.urlresolvers import reverse
 from django.test.utils import override_settings
+from django.urls import reverse
 from openid import fetchers
 from openid.consumer import consumer
 from openid.consumer.discover import OPENID_2_0_TYPE, OpenIDServiceEndpoint

=== modified file 'src/webui/tests/test_views_devices.py'
--- src/webui/tests/test_views_devices.py	2018-03-16 13:30:26 +0000
+++ src/webui/tests/test_views_devices.py	2018-05-30 16:21:15 +0000
@@ -9,9 +9,9 @@
 
 import mock
 from django.conf import settings
-from django.core.urlresolvers import reverse
 from django.db import transaction
 from django.test.utils import override_settings
+from django.urls import reverse
 from django.utils.timezone import now
 from gargoyle.testutils import switches
 from oath import hotp, totp

=== modified file 'src/webui/tests/test_views_i18n.py'
--- src/webui/tests/test_views_i18n.py	2018-02-09 20:56:16 +0000
+++ src/webui/tests/test_views_i18n.py	2018-05-30 16:21:15 +0000
@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from identityprovider.models.account import Account
 from identityprovider.tests import DEFAULT_USER_PASSWORD

=== modified file 'src/webui/tests/test_views_registration.py'
--- src/webui/tests/test_views_registration.py	2018-05-25 22:00:09 +0000
+++ src/webui/tests/test_views_registration.py	2018-05-30 16:21:15 +0000
@@ -9,8 +9,8 @@
 
 from django.conf import settings
 from django.contrib.auth.models import AnonymousUser
-from django.core.urlresolvers import reverse
 from django.test.utils import override_settings
+from django.urls import reverse
 
 from gargoyle.testutils import switches
 from mock import Mock, call

=== modified file 'src/webui/tests/test_views_ui.py'
--- src/webui/tests/test_views_ui.py	2018-02-20 17:14:51 +0000
+++ src/webui/tests/test_views_ui.py	2018-05-30 16:21:15 +0000
@@ -25,9 +25,9 @@
 from django.core import mail
 from django.core.cache import cache
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse
 from django.http import QueryDict
 from django.test.utils import override_settings
+from django.urls import reverse
 from django.utils.html import escape
 from gargoyle import gargoyle
 from gargoyle.testutils import switches
@@ -1964,7 +1964,7 @@
         account = Account.objects.get(id=self.account.id)
 
         self.assertTemplateUsed(response, 'account/suspended.html')
-        self.assertFalse(response.context['user'].is_authenticated())
+        self.assertFalse(response.context['user'].is_authenticated)
         self.assertEqual(account.status, AccountStatus.SUSPENDED)
         # since the account is NOT on the expected team, no email is sent
         self.assert_no_emails_sent()
@@ -1979,7 +1979,7 @@
         account = Account.objects.get(id=self.account.id)
 
         self.assertTemplateUsed(response, 'account/suspended.html')
-        self.assertFalse(response.context['user'].is_authenticated())
+        self.assertFalse(response.context['user'].is_authenticated)
         self.assertEqual(account.status, AccountStatus.SUSPENDED)
         # since the account is on the expected team, a notification is sent
         self.assert_account_suspended_warning_sent(account)

=== modified file 'src/webui/views/account.py'
--- src/webui/views/account.py	2018-05-25 20:41:26 +0000
+++ src/webui/views/account.py	2018-05-30 16:21:15 +0000
@@ -10,11 +10,11 @@
 
 from django.conf import settings
 from django.contrib import auth, messages
-from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
 from django.template.loader import render_to_string
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.views.decorators.vary import vary_on_headers
 from gargoyle import gargoyle
 from gargoyle.decorators import switch_is_active

=== modified file 'src/webui/views/consumer.py'
--- src/webui/views/consumer.py	2018-02-09 20:56:16 +0000
+++ src/webui/views/consumer.py	2018-05-30 16:21:15 +0000
@@ -13,9 +13,9 @@
 
 from django.conf import settings
 from django.contrib import messages
-from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
 from django_openid_auth.store import DjangoOpenIDStore

=== modified file 'src/webui/views/devices.py'
--- src/webui/views/devices.py	2018-02-09 20:56:16 +0000
+++ src/webui/views/devices.py	2018-05-30 16:21:15 +0000
@@ -10,10 +10,10 @@
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.views import redirect_to_login
-from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import View
 from gargoyle import gargoyle

=== modified file 'src/webui/views/errors.py'
--- src/webui/views/errors.py	2018-02-14 14:05:59 +0000
+++ src/webui/views/errors.py	2018-05-30 16:21:15 +0000
@@ -12,7 +12,7 @@
         self.status_code = status
         self.errormsg = errormsg
 
-    def __call__(self, request):
+    def __call__(self, request, exception=None):
         oopsid = request.environ.get('oops.report', {}).get('id', None)
         atts = {
             'request': request,

=== modified file 'src/webui/views/i18n.py'
--- src/webui/views/i18n.py	2018-02-09 20:56:16 +0000
+++ src/webui/views/i18n.py	2018-05-30 16:21:15 +0000
@@ -34,7 +34,7 @@
     if lang not in settings.SUPPORTED_LANGUAGES:
         raise Http404('Unsupported language')
 
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         account = request.user
         account.preferredlanguage = lang
         account.save()

=== modified file 'src/webui/views/registration.py'
--- src/webui/views/registration.py	2018-02-15 11:27:21 +0000
+++ src/webui/views/registration.py	2018-05-30 16:21:15 +0000
@@ -7,7 +7,6 @@
 from django.conf import settings
 from django.contrib import auth, messages
 from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
 from django.http import (
     HttpResponseNotAllowed,
     HttpResponseRedirect,
@@ -15,6 +14,7 @@
 )
 from django.template.loader import render_to_string
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.http import require_http_methods

=== modified file 'src/webui/views/ui.py'
--- src/webui/views/ui.py	2018-05-10 20:20:47 +0000
+++ src/webui/views/ui.py	2018-05-30 16:21:15 +0000
@@ -11,7 +11,6 @@
 from django.conf import settings
 from django.contrib import auth, messages
 from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse
 from django.http import (
     Http404,
     HttpResponse,
@@ -25,6 +24,7 @@
 )
 from django.template.loader import render_to_string
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.utils.http import urlquote
 from django.utils.translation import ugettext_lazy as _