diff options
| -rw-r--r-- | rpkid/rpki/gui/app/urls.py | 2 | ||||
| -rw-r--r-- | rpkid/rpki/gui/cacheview/urls.py | 2 | ||||
| -rw-r--r-- | rpkid/rpki/gui/urls.py | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/rpkid/rpki/gui/app/urls.py b/rpkid/rpki/gui/app/urls.py index dfa0e5db..de6521ec 100644 --- a/rpkid/rpki/gui/app/urls.py +++ b/rpkid/rpki/gui/app/urls.py @@ -15,7 +15,7 @@ __version__ = '$Id$' -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from rpki.gui.app import views urlpatterns = patterns( diff --git a/rpkid/rpki/gui/cacheview/urls.py b/rpkid/rpki/gui/cacheview/urls.py index 62dc8d61..49634ed8 100644 --- a/rpkid/rpki/gui/cacheview/urls.py +++ b/rpkid/rpki/gui/cacheview/urls.py @@ -15,7 +15,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. """ -from django.conf.urls.defaults import * +from django.conf.urls import patterns urlpatterns = patterns('', (r'^query$', 'rpki.gui.cacheview.views.query_view'), diff --git a/rpkid/rpki/gui/urls.py b/rpkid/rpki/gui/urls.py index 1bd50ce6..b5edd47b 100644 --- a/rpkid/rpki/gui/urls.py +++ b/rpkid/rpki/gui/urls.py @@ -15,9 +15,10 @@ __version__ = '$Id$' -from django.conf.urls.defaults import * +from django.conf.urls import patterns, include -urlpatterns = patterns('', +urlpatterns = patterns( + '', # Uncomment the admin/doc line below and add 'django.contrib.admindocs' # to INSTALLED_APPS to enable admin documentation: @@ -31,6 +32,5 @@ urlpatterns = patterns('', (r'^rpki/', include('rpki.gui.app.urls')), (r'^accounts/login/$', 'rpki.gui.views.login'), - (r'^accounts/logout/$', 'rpki.gui.views.logout', - {'next_page': '/rpki/'}), + (r'^accounts/logout/$', 'rpki.gui.views.logout', {'next_page': '/rpki/'}), ) |