Import urlresolvers from django.urls

In Django 1.10, django.core.urlresolvers is available from
django.urls. Use it.

plinth/menu.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 
 class Menu(object):

plinth/middleware.py

@@ -19,8 +19,8 @@
 Django middleware to show pre-setup message and setup progress.
 """
 
+from django import urls
 from django.contrib import messages
-from django.core import urlresolvers
 from django.utils.translation import ugettext_lazy as _
 import logging
 
@@ -41,8 +41,8 @@ class SetupMiddleware(object):
         # Perform a URL resolution. This is slightly inefficient as
         # Django will do this resolution again.
         try:
-            resolver_match = urlresolvers.resolve(request.path_info)
-        except urlresolvers.Resolver404:
+            resolver_match = urls.resolve(request.path_info)
+        except urls.Resolver404:
             return
 
         if not resolver_match.namespaces or not len(resolver_match.namespaces):

plinth/modules/disks/views.py

@@ -20,9 +20,9 @@ Views for disks module.
 """
 
 from django.contrib import messages
-from django.core.urlresolvers import reverse
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 
 from plinth.modules import disks as disks_module

plinth/modules/dynamicdns/dynamicdns.py

@@ -18,7 +18,7 @@
 from django import forms
 from django.contrib import messages
 from django.core import validators
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext as _, ugettext_lazy
 from django.template.response import TemplateResponse
 import logging

plinth/modules/first_boot/middleware.py

@@ -20,8 +20,8 @@ Django middleware to redirect to firstboot wizard if it has not be run
 yet.
 """
 
-from django.core.urlresolvers import reverse
 from django.http.response import HttpResponseRedirect
+from django.urls import reverse
 import logging
 
 from plinth import kvstore
@@ -48,7 +48,8 @@ class FirstBootMiddleware(object):
         if state >= 10 and user_requests_firstboot:
             return HttpResponseRedirect(reverse('index'))
 
-        # Setup is not complete: Forbid accessing anything but firstboot or help
+        # Setup is not complete: Forbid accessing anything but
+        # firstboot or help
         if state < 10 and not user_requests_firstboot and \
            not user_requests_help:
             return HttpResponseRedirect(reverse('first_boot:state%d' % state))

plinth/modules/first_boot/views.py

@@ -17,9 +17,9 @@
 
 from django.contrib import messages
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse_lazy
 from django.http.response import HttpResponseRedirect
 from django.shortcuts import render
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext as _
 from django.views.generic import CreateView, FormView, TemplateView
 

plinth/modules/ikiwiki/views.py

@@ -20,9 +20,9 @@ Plinth module for configuring ikiwiki
 """
 
 from django.contrib import messages
-from django.core.urlresolvers import reverse_lazy
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext as _, ugettext_lazy
 
 from plinth import actions

plinth/modules/letsencrypt/views.py

@@ -20,9 +20,9 @@ Plinth module for using Let's Encrypt.
 """
 
 from django.contrib import messages
-from django.core.urlresolvers import reverse_lazy
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext as _
 from django.views.decorators.http import require_POST
 import json

plinth/modules/monkeysphere/views.py

@@ -20,9 +20,9 @@ Views for the monkeysphere module.
 """
 
 from django.contrib import messages
-from django.core.urlresolvers import reverse_lazy
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext as _
 from django.views.decorators.http import require_POST
 import json

plinth/modules/networks/networks.py

@@ -16,9 +16,9 @@
 #
 
 from django.contrib import messages
-from django.core.urlresolvers import reverse_lazy
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext as _, ugettext_lazy
 from django.views.decorators.http import require_POST
 from logging import Logger

plinth/modules/pagekite/views.py

@@ -15,9 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from django.core.urlresolvers import reverse, reverse_lazy
 from django.http.response import HttpResponseRedirect
 from django.template.response import TemplateResponse
+from django.urls import reverse, reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import View, TemplateView
 from django.views.generic.edit import FormView

plinth/modules/power/views.py

@@ -20,9 +20,9 @@ Plinth module for power module.
 """
 
 from django.forms import Form
-from django.core.urlresolvers import reverse
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 
 from plinth import actions

plinth/modules/upgrades/views.py

@@ -20,8 +20,8 @@ Plinth module for upgrades
 """
 
 from django.contrib import messages
-from django.core.urlresolvers import reverse_lazy
 from django.template.response import TemplateResponse
+from django.urls import reverse_lazy
 from django.utils.translation import ugettext as _, ugettext_lazy
 from django.views.generic.edit import FormView
 import subprocess

plinth/modules/users/urls.py

@@ -21,7 +21,7 @@ URLs for the Users module
 
 from django.conf.urls import url
 from django.contrib.auth import views as auth_views
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 
 from . import views
 

plinth/modules/users/views.py

@@ -19,7 +19,7 @@ from django.contrib import messages
 from django.contrib.auth import update_session_auth_hash
 from django.contrib.auth.models import User
 from django.contrib.messages.views import SuccessMessageMixin
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.views.generic.edit import (CreateView, DeleteView, UpdateView,
                                        FormView)
 from django.views.generic import ListView

plinth/tests/test_menu.py

@@ -19,9 +19,9 @@
 Test module for menus.
 """
 
-from django.core.urlresolvers import reverse
 from django.http import HttpRequest
 from django.test import TestCase
+from django.urls import reverse
 import random
 
 from plinth.menu import Menu

plinth/tests/test_middleware.py

@@ -67,7 +67,7 @@ class TestSetupMiddleware(TestCase):
         self.assertEqual(response, None)
 
     @patch('plinth.module_loader.loaded_modules')
-    @patch('django.core.urlresolvers.resolve')
+    @patch('django.urls.resolve')
     def test_module_is_up_to_date(self, resolve, loaded_modules):
         """Test that none is returned when module is up-to-date."""
         resolve.return_value.namespaces = ['mockapp']
@@ -84,7 +84,7 @@ class TestSetupMiddleware(TestCase):
 
     @patch('plinth.views.SetupView')
     @patch('plinth.module_loader.loaded_modules')
-    @patch('django.core.urlresolvers.resolve')
+    @patch('django.urls.resolve')
     def test_module_view(self, resolve, loaded_modules, setup_view):
         """Test that setup view is returned."""
         resolve.return_value.namespaces = ['mockapp']
@@ -102,7 +102,7 @@ class TestSetupMiddleware(TestCase):
 
     @patch('django.contrib.messages.success')
     @patch('plinth.module_loader.loaded_modules')
-    @patch('django.core.urlresolvers.resolve')
+    @patch('django.urls.resolve')
     def test_install_result_collection(self, resolve, loaded_modules,
                                        messages_success):
         """Test that module installation result is collected properly."""

plinth/views.py

@@ -21,10 +21,10 @@ Main Plinth views
 
 from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse
 from django.http.response import HttpResponseRedirect
 from django.views.generic import TemplateView
 from django.views.generic.edit import FormView
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 import time