# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1334430853 18000
# Node ID 9b9daefba97ad9edf5294059353373309764eddd
# Parent  cbbe7a2758873e96ca28d3b41aabdf1b9914f1b9
For Django 1.4, django.conf.urls.defaults is deprecated.

Use django.conf.urls instead.

diff -r cbbe7a275887 -r 9b9daefba97a madeira/articles/urls.py
--- a/madeira/articles/urls.py	Sat Apr 14 13:58:26 2012 -0500
+++ b/madeira/articles/urls.py	Sat Apr 14 14:14:13 2012 -0500
@@ -2,7 +2,7 @@
 Urls for the articles application.
 
 """
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.views.generic import DetailView, ListView
 
 from articles.models import Article
diff -r cbbe7a275887 -r 9b9daefba97a madeira/band/urls.py
--- a/madeira/band/urls.py	Sat Apr 14 13:58:26 2012 -0500
+++ b/madeira/band/urls.py	Sat Apr 14 14:14:13 2012 -0500
@@ -2,7 +2,7 @@
 Urls for the band application.
 
 """
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('band.views',
    url(r'^bio/$', 'bio', name='band-bio'),
diff -r cbbe7a275887 -r 9b9daefba97a madeira/email_list/admin.py
--- a/madeira/email_list/admin.py	Sat Apr 14 13:58:26 2012 -0500
+++ b/madeira/email_list/admin.py	Sat Apr 14 14:14:13 2012 -0500
@@ -3,7 +3,7 @@
 
 """
 from django.contrib import admin
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.shortcuts import render, redirect
 
 from email_list.models import Subscriber
diff -r cbbe7a275887 -r 9b9daefba97a madeira/email_list/urls.py
--- a/madeira/email_list/urls.py	Sat Apr 14 13:58:26 2012 -0500
+++ b/madeira/email_list/urls.py	Sat Apr 14 14:14:13 2012 -0500
@@ -2,7 +2,7 @@
 Urls for the email_list application.
 
 """
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.views.generic import TemplateView
 
 
diff -r cbbe7a275887 -r 9b9daefba97a madeira/gigs/urls.py
--- a/madeira/gigs/urls.py	Sat Apr 14 13:58:26 2012 -0500
+++ b/madeira/gigs/urls.py	Sat Apr 14 14:14:13 2012 -0500
@@ -2,7 +2,7 @@
 Urls for the gigs application.
 
 """
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.views.generic import ListView
 
 from gigs.models import Gig
diff -r cbbe7a275887 -r 9b9daefba97a madeira/mp3/urls.py
--- a/madeira/mp3/urls.py	Sat Apr 14 13:58:26 2012 -0500
+++ b/madeira/mp3/urls.py	Sat Apr 14 14:14:13 2012 -0500
@@ -2,7 +2,7 @@
 Urls for the mp3 application.
 
 """
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.views.generic import ListView
 
 from mp3.models import Collection
diff -r cbbe7a275887 -r 9b9daefba97a madeira/news/urls.py
--- a/madeira/news/urls.py	Sat Apr 14 13:58:26 2012 -0500
+++ b/madeira/news/urls.py	Sat Apr 14 14:14:13 2012 -0500
@@ -2,7 +2,7 @@
 Urls for the news application.
 
 """
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.views.generic import DetailView, ListView
 
 from news.models import News
diff -r cbbe7a275887 -r 9b9daefba97a madeira/photologue/urls.py
--- a/madeira/photologue/urls.py	Sat Apr 14 13:58:26 2012 -0500
+++ b/madeira/photologue/urls.py	Sat Apr 14 14:14:13 2012 -0500
@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 from models import *
 
 # Number of random images from the gallery to display.
diff -r cbbe7a275887 -r 9b9daefba97a madeira/urls.py
--- a/madeira/urls.py	Sat Apr 14 13:58:26 2012 -0500
+++ b/madeira/urls.py	Sat Apr 14 14:14:13 2012 -0500
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, include, url
 from django.contrib import admin
 from django.conf.urls.static import static
 from django.conf import settings
diff -r cbbe7a275887 -r 9b9daefba97a madeira/videos/urls.py
--- a/madeira/videos/urls.py	Sat Apr 14 13:58:26 2012 -0500
+++ b/madeira/videos/urls.py	Sat Apr 14 14:14:13 2012 -0500
@@ -2,7 +2,7 @@
 Urls for the videos application.
 
 """
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.views.generic import DetailView, ListView
 
 from videos.models import Collection