diff --git a/plinth/module_loader.py b/plinth/module_loader.py index 7b1443134..e8cfd6dc9 100644 --- a/plinth/module_loader.py +++ b/plinth/module_loader.py @@ -108,9 +108,9 @@ def _include_module_urls(module_name): namespace = module_name.split('.')[-1] url_module = module_name + '.urls' try: - urls.urlpatterns += django.conf.urls.patterns( - '', django.conf.urls.url( - r'', django.conf.urls.include(url_module, namespace))) + urls.urlpatterns += [ + django.conf.urls.url( + r'', django.conf.urls.include(url_module, namespace))] except ImportError: LOGGER.debug('No URLs for %s', module_name) if cfg.debug: diff --git a/plinth/modules/apps/urls.py b/plinth/modules/apps/urls.py index db2b9e547..98bf022ed 100644 --- a/plinth/modules/apps/urls.py +++ b/plinth/modules/apps/urls.py @@ -19,10 +19,11 @@ URLs for the Apps module """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import apps as views -urlpatterns = patterns( # pylint: disable-msg=C0103 - 'plinth.modules.apps.apps', - url(r'^apps/$', 'index', name='index') - ) +urlpatterns = [ + url(r'^apps/$', views.index, name='index'), +] diff --git a/plinth/modules/avahi/urls.py b/plinth/modules/avahi/urls.py index 837aebe61..d9f84d89d 100644 --- a/plinth/modules/avahi/urls.py +++ b/plinth/modules/avahi/urls.py @@ -19,9 +19,11 @@ URLs for the service discovery module. """ -from django.conf.urls import patterns, url +from django.conf.urls import url -urlpatterns = patterns( # pylint: disable=C0103 - 'plinth.modules.avahi.views', - url(r'^sys/avahi/$', 'index', name='index'), - ) +from . import views + + +urlpatterns = [ + url(r'^sys/avahi/$', views.index, name='index'), +] diff --git a/plinth/modules/config/urls.py b/plinth/modules/config/urls.py index a66f593d0..35f392f31 100644 --- a/plinth/modules/config/urls.py +++ b/plinth/modules/config/urls.py @@ -21,8 +21,9 @@ URLs for the Configuration module from django.conf.urls import patterns, url +from . import config as views -urlpatterns = patterns( # pylint: disable-msg=C0103 - 'plinth.modules.config.config', - url(r'^sys/config/$', 'index', name='index'), - ) + +urlpatterns = [ + url(r'^sys/config/$', views.index, name='index'), +] diff --git a/plinth/modules/datetime/urls.py b/plinth/modules/datetime/urls.py index 467522211..080e3e103 100644 --- a/plinth/modules/datetime/urls.py +++ b/plinth/modules/datetime/urls.py @@ -19,10 +19,10 @@ URLs for the date and time module """ -from django.conf.urls import patterns, url +from django.conf.urls import url +from . import views -urlpatterns = patterns( - 'plinth.modules.datetime.views', - url(r'^sys/datetime/$', 'index', name='index'), - ) +urlpatterns = [ + url(r'^sys/datetime/$', views.index, name='index'), +] diff --git a/plinth/modules/deluge/urls.py b/plinth/modules/deluge/urls.py index d41266f56..a36941271 100644 --- a/plinth/modules/deluge/urls.py +++ b/plinth/modules/deluge/urls.py @@ -19,10 +19,11 @@ URLs for the Deluge module. """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import views -urlpatterns = patterns( - 'plinth.modules.deluge.views', - url(r'^apps/deluge/$', 'index', name='index'), - ) +urlpatterns = [ + url(r'^apps/deluge/$', views.index, name='index'), +] diff --git a/plinth/modules/diagnostics/urls.py b/plinth/modules/diagnostics/urls.py index 741538c7c..54d130ae9 100644 --- a/plinth/modules/diagnostics/urls.py +++ b/plinth/modules/diagnostics/urls.py @@ -19,12 +19,13 @@ URLs for the Diagnostics module """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import diagnostics as views -urlpatterns = patterns( # pylint: disable-msg=C0103 - 'plinth.modules.diagnostics.diagnostics', - url(r'^sys/diagnostics/$', 'index', name='index'), - url(r'^sys/diagnostics/(?P[a-z\-]+)/$', 'module', +urlpatterns = [ + url(r'^sys/diagnostics/$', views.index, name='index'), + url(r'^sys/diagnostics/(?P[a-z\-]+)/$', views.module, name='module'), - ) +] diff --git a/plinth/modules/dynamicdns/urls.py b/plinth/modules/dynamicdns/urls.py index 04ff51485..871205a0a 100644 --- a/plinth/modules/dynamicdns/urls.py +++ b/plinth/modules/dynamicdns/urls.py @@ -19,12 +19,13 @@ URLs for the dynamicdns module """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import dynamicdns as views -urlpatterns = patterns( - 'plinth.modules.dynamicdns.dynamicdns', - url(r'^apps/dynamicdns/$', 'index', name='index'), - url(r'^apps/dynamicdns/configure/$', 'configure', name='configure'), - url(r'^apps/dynamicdns/statuspage/$', 'statuspage', name='statuspage') -) +urlpatterns = [ + url(r'^apps/dynamicdns/$', views.index, name='index'), + url(r'^apps/dynamicdns/configure/$', views.configure, name='configure'), + url(r'^apps/dynamicdns/statuspage/$', views.statuspage, name='statuspage'), +] diff --git a/plinth/modules/firewall/urls.py b/plinth/modules/firewall/urls.py index 3d2da27b7..6448e89f6 100644 --- a/plinth/modules/firewall/urls.py +++ b/plinth/modules/firewall/urls.py @@ -19,10 +19,11 @@ URLs for the Firewall module """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import firewall as views -urlpatterns = patterns( # pylint: disable-msg=C0103 - 'plinth.modules.firewall.firewall', - url(r'^sys/firewall/$', 'index', name='index') - ) +urlpatterns = [ + url(r'^sys/firewall/$', views.index, name='index'), +] diff --git a/plinth/modules/first_boot/urls.py b/plinth/modules/first_boot/urls.py index 88a41e6f3..5356b4685 100644 --- a/plinth/modules/first_boot/urls.py +++ b/plinth/modules/first_boot/urls.py @@ -19,17 +19,16 @@ URLs for the First Boot module """ -from django.conf.urls import patterns, url +from django.conf.urls import url from stronghold.decorators import public -from .views import State0View, State1View +from .views import State0View, State1View, state10 -urlpatterns = patterns( # pylint: disable-msg=C0103 - 'plinth.modules.first_boot.views', +urlpatterns = [ # Take care of the firstboot middleware when changing URLs url(r'^firstboot/$', public(State0View.as_view()), name='index'), url(r'^firstboot/state0/$', public(State0View.as_view()), name='state0'), url(r'^firstboot/state1/$', public(State1View.as_view()), name='state1'), - url(r'^firstboot/state10/$', 'state10', name='state10'), - ) + url(r'^firstboot/state10/$', state10, name='state10'), +] diff --git a/plinth/modules/help/urls.py b/plinth/modules/help/urls.py index 24efd2113..52fed0a01 100644 --- a/plinth/modules/help/urls.py +++ b/plinth/modules/help/urls.py @@ -19,16 +19,17 @@ URLs for the Help module """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import help as views -urlpatterns = patterns( # pylint: disable-msg=C0103 - 'plinth.modules.help.help', +urlpatterns = [ # having two urls for one page is a hack to help the current url/menu # system highlight the correct menu item. Every submenu-item with the same # url prefix as the main-menu is highlighted automatically. - url(r'^help/$', 'index', name='index'), - url(r'^help/index/$', 'index', name='index_explicit'), - url(r'^help/about/$', 'about', name='about'), - url(r'^help/manual/$', 'manual', name='manual'), -) + url(r'^help/$', views.index, name='index'), + url(r'^help/index/$', views.index, name='index_explicit'), + url(r'^help/about/$', views.about, name='about'), + url(r'^help/manual/$', views.manual, name='manual'), +] diff --git a/plinth/modules/ikiwiki/urls.py b/plinth/modules/ikiwiki/urls.py index 2b5d9fbe9..59bf30236 100644 --- a/plinth/modules/ikiwiki/urls.py +++ b/plinth/modules/ikiwiki/urls.py @@ -19,14 +19,15 @@ URLs for the ikiwiki module """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import views -urlpatterns = patterns( - 'plinth.modules.ikiwiki.views', - url(r'^apps/ikiwiki/$', 'index', name='index'), - url(r'^apps/ikiwiki/manage/$', 'manage', name='manage'), - url(r'^apps/ikiwiki/(?P[\w.@+-]+)/delete/$', - 'delete', name='delete'), - url(r'^apps/ikiwiki/create/$', 'create', name='create'), - ) +urlpatterns = [ + url(r'^apps/ikiwiki/$', views.index, name='index'), + url(r'^apps/ikiwiki/manage/$', views.manage, name='manage'), + url(r'^apps/ikiwiki/(?P[\w.@+-]+)/delete/$', views.delete, + name='delete'), + url(r'^apps/ikiwiki/create/$', views.create, name='create'), +] diff --git a/plinth/modules/mumble/urls.py b/plinth/modules/mumble/urls.py index 1ae30062c..87f27aa88 100644 --- a/plinth/modules/mumble/urls.py +++ b/plinth/modules/mumble/urls.py @@ -19,10 +19,11 @@ URLs for the Mumble module """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import views -urlpatterns = patterns( - 'plinth.modules.mumble.views', - url(r'^apps/mumble/$', 'index', name='index'), - ) +urlpatterns = [ + url(r'^apps/mumble/$', views.index, name='index'), +] diff --git a/plinth/modules/names/urls.py b/plinth/modules/names/urls.py index ee8cec746..04ef04219 100644 --- a/plinth/modules/names/urls.py +++ b/plinth/modules/names/urls.py @@ -19,10 +19,11 @@ URLs for the name services module """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import views -urlpatterns = patterns( - 'plinth.modules.names.views', - url(r'^sys/names/$', 'index', name='index'), -) +urlpatterns = [ + url(r'^sys/names/$', views.index, name='index'), +] diff --git a/plinth/modules/networks/urls.py b/plinth/modules/networks/urls.py index d07739551..7c5828c60 100644 --- a/plinth/modules/networks/urls.py +++ b/plinth/modules/networks/urls.py @@ -19,26 +19,26 @@ URLs for the Network module """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import networks as views -urlpatterns = patterns( - 'plinth.modules.networks.networks', - url(r'^sys/networks/$', 'index', name='index'), - url(r'^sys/networks/(?P[\w.@+-]+)/show/$', - 'show', name='show'), - url(r'^sys/networks/(?P[\w.@+-]+)/edit/$', - 'edit', name='edit'), - url(r'^sys/networks/(?P[\w.@+-]+)/activate/$', - 'activate', name='activate'), - url(r'^sys/networks/(?P[\w.@+-]+)/deactivate/$', - 'deactivate', name='deactivate'), - url(r'^sys/networks/scan/$', 'scan', name='scan'), - url(r'^sys/networks/add/$', 'add', name='add'), - url(r'^sys/networks/add/ethernet/$', 'add_ethernet', name='add_ethernet'), - url(r'^sys/networks/add/pppoe/$', 'add_pppoe', name='add_pppoe'), - url(r'^sys/networks/add/wifi/(?:(?P[^/]+)/(?P[^/]+)/)?$', 'add_wifi', - name='add_wifi'), - url(r'^sys/networks/(?P[\w.@+-]+)/delete/$', - 'delete', name='delete'), -) +urlpatterns = [ + url(r'^sys/networks/$', views.index, name='index'), + url(r'^sys/networks/(?P[\w.@+-]+)/show/$', views.show, name='show'), + url(r'^sys/networks/(?P[\w.@+-]+)/edit/$', views.edit, name='edit'), + url(r'^sys/networks/(?P[\w.@+-]+)/activate/$', views.activate, + name='activate'), + url(r'^sys/networks/(?P[\w.@+-]+)/deactivate/$', views.deactivate, + name='deactivate'), + url(r'^sys/networks/scan/$', views.scan, name='scan'), + url(r'^sys/networks/add/$', views.add, name='add'), + url(r'^sys/networks/add/ethernet/$', views.add_ethernet, + name='add_ethernet'), + url(r'^sys/networks/add/pppoe/$', views.add_pppoe, name='add_pppoe'), + url(r'^sys/networks/add/wifi/(?:(?P[^/]+)/(?P[^/]+)/)?$', + views.add_wifi, name='add_wifi'), + url(r'^sys/networks/(?P[\w.@+-]+)/delete/$', views.delete, + name='delete'), +] diff --git a/plinth/modules/openvpn/urls.py b/plinth/modules/openvpn/urls.py index 935604ce0..e8808b883 100644 --- a/plinth/modules/openvpn/urls.py +++ b/plinth/modules/openvpn/urls.py @@ -19,12 +19,13 @@ URLs for the OpenVPN module. """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import views -urlpatterns = patterns( # pylint: disable-msg=C0103 - 'plinth.modules.openvpn.views', - url(r'^apps/openvpn/$', 'index', name='index'), - url(r'^apps/openvpn/setup/$', 'setup', name='setup'), - url(r'^apps/openvpn/profile/$', 'profile', name='profile'), - ) +urlpatterns = [ + url(r'^apps/openvpn/$', views.index, name='index'), + url(r'^apps/openvpn/setup/$', views.setup, name='setup'), + url(r'^apps/openvpn/profile/$', views.profile, name='profile'), +] diff --git a/plinth/modules/owncloud/urls.py b/plinth/modules/owncloud/urls.py index 8882159ea..d69ac14ef 100644 --- a/plinth/modules/owncloud/urls.py +++ b/plinth/modules/owncloud/urls.py @@ -19,10 +19,11 @@ URLs for the ownCloud module """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import owncloud as views -urlpatterns = patterns( # pylint: disable-msg=C0103 - 'plinth.modules.owncloud.owncloud', - url(r'^apps/owncloud/$', 'index', name='index'), - ) +urlpatterns = [ + url(r'^apps/owncloud/$', views.index, name='index'), +] diff --git a/plinth/modules/pagekite/urls.py b/plinth/modules/pagekite/urls.py index e88cd839f..e8722df05 100644 --- a/plinth/modules/pagekite/urls.py +++ b/plinth/modules/pagekite/urls.py @@ -19,14 +19,13 @@ URLs for the PageKite module """ -from django.conf.urls import patterns, url +from django.conf.urls import url from .views import StandardServiceView, CustomServiceView, ConfigurationView, \ DeleteServiceView, index -urlpatterns = patterns( # pylint: disable-msg=C0103 - 'plinth.modules.pagekite.views', +urlpatterns = [ url(r'^apps/pagekite/$', index, name='index'), url(r'^apps/pagekite/configure/$', ConfigurationView.as_view(), name='configure'), @@ -36,4 +35,4 @@ urlpatterns = patterns( # pylint: disable-msg=C0103 name='custom-services'), url(r'^apps/pagekite/services/custom/delete$', DeleteServiceView.as_view(), name='delete-custom-service'), - ) +] diff --git a/plinth/modules/power/urls.py b/plinth/modules/power/urls.py index 465426ba2..940f7140c 100644 --- a/plinth/modules/power/urls.py +++ b/plinth/modules/power/urls.py @@ -19,11 +19,13 @@ URLs for the power module. """ -from django.conf.urls import patterns, url +from django.conf.urls import url -urlpatterns = patterns( - 'plinth.modules.power.views', - url(r'^sys/power/$', 'index', name='index'), - url(r'^sys/power/restart$', 'restart', name='restart'), - url(r'^sys/power/shutdown$', 'shutdown', name='shutdown'), - ) +from . import views + + +urlpatterns = [ + url(r'^sys/power/$', views.index, name='index'), + url(r'^sys/power/restart$', views.restart, name='restart'), + url(r'^sys/power/shutdown$', views.shutdown, name='shutdown'), +] diff --git a/plinth/modules/privoxy/urls.py b/plinth/modules/privoxy/urls.py index 52d8cf353..3ca303381 100644 --- a/plinth/modules/privoxy/urls.py +++ b/plinth/modules/privoxy/urls.py @@ -19,10 +19,11 @@ URLs for the Privoxy module. """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import views -urlpatterns = patterns( - 'plinth.modules.privoxy.views', - url(r'^apps/privoxy/$', 'index', name='index'), - ) +urlpatterns = [ + url(r'^apps/privoxy/$', views.index, name='index'), +] diff --git a/plinth/modules/restore/urls.py b/plinth/modules/restore/urls.py index 1ed758ab5..69cec1a51 100644 --- a/plinth/modules/restore/urls.py +++ b/plinth/modules/restore/urls.py @@ -19,11 +19,11 @@ URLs for the reStore module. """ -from django.conf.urls import patterns, url -from .views import index +from django.conf.urls import url + +from . import views -urlpatterns = patterns( - 'plinth.modules.restore.views', - url(r'^apps/restore/$', index, name='index') -) +urlpatterns = [ + url(r'^apps/restore/$', views.index, name='index'), +] diff --git a/plinth/modules/roundcube/urls.py b/plinth/modules/roundcube/urls.py index 1950d1ffa..66be5df69 100644 --- a/plinth/modules/roundcube/urls.py +++ b/plinth/modules/roundcube/urls.py @@ -19,10 +19,11 @@ URLs for the Roundcube module. """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import views -urlpatterns = patterns( - 'plinth.modules.roundcube.views', - url(r'^apps/roundcube/$', 'index', name='index'), - ) +urlpatterns = [ + url(r'^apps/roundcube/$', views.index, name='index'), +] diff --git a/plinth/modules/shaarli/urls.py b/plinth/modules/shaarli/urls.py index 93beeff78..2784905eb 100644 --- a/plinth/modules/shaarli/urls.py +++ b/plinth/modules/shaarli/urls.py @@ -19,10 +19,11 @@ URLs for the Shaarli module. """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import views -urlpatterns = patterns( - 'plinth.modules.shaarli.views', - url(r'^apps/shaarli/$', 'index', name='index'), -) +urlpatterns = [ + url(r'^apps/shaarli/$', views.index, name='index'), +] diff --git a/plinth/modules/system/urls.py b/plinth/modules/system/urls.py index 179556675..aceecc21d 100644 --- a/plinth/modules/system/urls.py +++ b/plinth/modules/system/urls.py @@ -19,10 +19,11 @@ URLs for the System module """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import system as views -urlpatterns = patterns( # pylint: disable-msg=C0103 - 'plinth.modules.system.system', - url(r'^sys/$', 'index', name='index'), - ) +urlpatterns = [ + url(r'^sys/$', views.index, name='index'), +] diff --git a/plinth/modules/tor/urls.py b/plinth/modules/tor/urls.py index 7962614f4..2bca8ef3c 100644 --- a/plinth/modules/tor/urls.py +++ b/plinth/modules/tor/urls.py @@ -19,10 +19,11 @@ URLs for the Tor module """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import tor as views -urlpatterns = patterns( # pylint: disable-msg=C0103 - 'plinth.modules.tor.tor', - url(r'^apps/tor/$', 'index', name='index') - ) +urlpatterns = [ + url(r'^apps/tor/$', views.index, name='index'), +] diff --git a/plinth/modules/transmission/urls.py b/plinth/modules/transmission/urls.py index a599ee83a..e3ff718f3 100644 --- a/plinth/modules/transmission/urls.py +++ b/plinth/modules/transmission/urls.py @@ -19,10 +19,11 @@ URLs for the Transmission module. """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import views -urlpatterns = patterns( # pylint: disable-msg=C0103 - 'plinth.modules.transmission.views', - url(r'^apps/transmission/$', 'index', name='index'), - ) +urlpatterns = [ + url(r'^apps/transmission/$', views.index, name='index'), +] diff --git a/plinth/modules/upgrades/urls.py b/plinth/modules/upgrades/urls.py index b7bfb3b96..5ff9f8788 100644 --- a/plinth/modules/upgrades/urls.py +++ b/plinth/modules/upgrades/urls.py @@ -19,12 +19,13 @@ URLs for the upgrades module """ -from django.conf.urls import patterns, url +from django.conf.urls import url + +from . import views -urlpatterns = patterns( - 'plinth.modules.upgrades.views', - url(r'^sys/upgrades/$', 'index', name='index'), - url(r'^sys/upgrades/upgrade/$', 'upgrade', name='upgrade'), - url(r'^sys/upgrades/upgrade/run/$', 'run', name='run'), - ) +urlpatterns = [ + url(r'^sys/upgrades/$', views.index, name='index'), + url(r'^sys/upgrades/upgrade/$', views.upgrade, name='upgrade'), + url(r'^sys/upgrades/upgrade/run/$', views.run, name='run'), +] diff --git a/plinth/modules/users/urls.py b/plinth/modules/users/urls.py index a305ad129..234252e97 100644 --- a/plinth/modules/users/urls.py +++ b/plinth/modules/users/urls.py @@ -19,14 +19,14 @@ URLs for the Users module """ -from django.conf.urls import patterns, url +from django.conf.urls import url +from django.contrib.auth import views as auth_views from django.core.urlresolvers import reverse_lazy from . import views -urlpatterns = patterns( - '', +urlpatterns = [ url(r'^sys/users/$', views.UserList.as_view(), name='index'), url(r'^sys/users/create/$', views.UserCreate.as_view(), name='create'), url(r'^sys/users/(?P[\w.@+-]+)/edit/$', views.UserUpdate.as_view(), @@ -36,8 +36,8 @@ urlpatterns = patterns( url(r'^sys/users/(?P[\w.@+-]+)/change_password/$', views.UserChangePassword.as_view(), name='change_password'), # Add Django's login/logout urls - url(r'^accounts/login/$', 'django.contrib.auth.views.login', + url(r'^accounts/login/$', auth_views.login, {'template_name': 'login.html'}, name='login'), - url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', + url(r'^accounts/logout/$', auth_views.logout, {'next_page': reverse_lazy('index')}, name='logout'), -) +] diff --git a/plinth/modules/xmpp/urls.py b/plinth/modules/xmpp/urls.py index 3a6d5aa1f..db022e9cf 100644 --- a/plinth/modules/xmpp/urls.py +++ b/plinth/modules/xmpp/urls.py @@ -19,10 +19,10 @@ URLs for the XMPP module """ -from django.conf.urls import patterns, url +from django.conf.urls import url +from . import views -urlpatterns = patterns( # pylint: disable-msg=C0103 - 'plinth.modules.xmpp.views', - url(r'^apps/xmpp/$', 'index', name='index'), -) +urlpatterns = [ + url(r'^apps/xmpp/$', views.index, name='index'), +]