diff options
| author | Dan McGee <dan@archlinux.org> | 2012-03-24 00:29:42 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-03-24 01:54:40 +0100 |
| commit | b8c20439c091aaa56e772441e6c3a7e57e8ef2d4 (patch) | |
| tree | f7c7922c5ebb3b9a29fb2c170974dea5e4cf5761 | |
| parent | 0545e3e0ec864eaed4facc94158e3ed9da1dfb2b (diff) | |
| download | archweb-b8c20439c091aaa56e772441e6c3a7e57e8ef2d4.tar.gz archweb-b8c20439c091aaa56e772441e6c3a7e57e8ef2d4.tar.xz | |
Change Django urls.py import
Until Django 1.3, the functions include(), patterns() and url() plus
handler404, handler500 were located in a django.conf.urls.defaults
module.
In Django 1.4, they live in django.conf.urls.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | devel/urls.py | 2 | ||||
| -rw-r--r-- | mirrors/urls.py | 2 | ||||
| -rw-r--r-- | mirrors/urls_mirrorlist.py | 2 | ||||
| -rw-r--r-- | news/urls.py | 2 | ||||
| -rw-r--r-- | packages/urls.py | 2 | ||||
| -rw-r--r-- | packages/urls_groups.py | 2 | ||||
| -rw-r--r-- | releng/urls.py | 2 | ||||
| -rw-r--r-- | todolists/urls.py | 2 | ||||
| -rw-r--r-- | urls.py | 2 | ||||
| -rw-r--r-- | visualize/urls.py | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/devel/urls.py b/devel/urls.py index 07cb321..31afc86 100644 --- a/devel/urls.py +++ b/devel/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns urlpatterns = patterns('devel.views', (r'^admin_log/$','admin_log'), diff --git a/mirrors/urls.py b/mirrors/urls.py index fed9c80..f002e9d 100644 --- a/mirrors/urls.py +++ b/mirrors/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns urlpatterns = patterns('mirrors.views', (r'^$', 'mirrors', {}, 'mirror-list'), diff --git a/mirrors/urls_mirrorlist.py b/mirrors/urls_mirrorlist.py index 70bc18d..e0f44c7 100644 --- a/mirrors/urls_mirrorlist.py +++ b/mirrors/urls_mirrorlist.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns urlpatterns = patterns('mirrors.views', (r'^$', 'generate_mirrorlist', {}, 'mirrorlist'), diff --git a/news/urls.py b/news/urls.py index d938ef5..10020f3 100644 --- a/news/urls.py +++ b/news/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns urlpatterns = patterns('news.views', (r'^$', 'news_list', {}, 'news-list'), diff --git a/packages/urls.py b/packages/urls.py index 52b09d2..7e12a23 100644 --- a/packages/urls.py +++ b/packages/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import include, patterns +from django.conf.urls import include, patterns package_patterns = patterns('packages.views', (r'^$', 'details'), diff --git a/packages/urls_groups.py b/packages/urls_groups.py index d609944..49ced14 100644 --- a/packages/urls_groups.py +++ b/packages/urls_groups.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns urlpatterns = patterns('packages.views', (r'^$', 'groups', {}, 'groups-list'), diff --git a/releng/urls.py b/releng/urls.py index 239ad02..8d1b8f2 100644 --- a/releng/urls.py +++ b/releng/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import include, patterns +from django.conf.urls import include, patterns feedback_patterns = patterns('releng.views', (r'^$', 'test_results_overview', {}, 'releng-test-overview'), diff --git a/todolists/urls.py b/todolists/urls.py index 0bd8817..a379468 100644 --- a/todolists/urls.py +++ b/todolists/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns from django.contrib.auth.decorators import permission_required from .views import DeleteTodolist @@ -1,7 +1,7 @@ import os.path # Stupid Django. Don't remove these "unused" handler imports -from django.conf.urls.defaults import handler500, handler404, include, patterns +from django.conf.urls import handler500, handler404, include, patterns from django.conf import settings from django.contrib import admin diff --git a/visualize/urls.py b/visualize/urls.py index 02d83be..907f6a2 100644 --- a/visualize/urls.py +++ b/visualize/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns urlpatterns = patterns('visualize.views', (r'^$', 'index', {}, 'visualize-index'), |