From 7ace8e9a89bec3487e220261235ffbb9d8b6b995 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Stefan=20K=C3=B6gl?= <stefan@skoegl.net>
Date: Sat, 2 Mar 2013 19:56:34 +0100
Subject: [PATCH] remove deprecation warnings for django.conf.urls.defaults

---
 mygpo/admin/urls.py     | 2 +-
 mygpo/api/urls.py       | 2 +-
 mygpo/directory/urls.py | 2 +-
 mygpo/publisher/urls.py | 2 +-
 mygpo/share/urls.py     | 2 +-
 mygpo/urls.py           | 2 +-
 mygpo/userfeeds/urls.py | 2 +-
 mygpo/web/urls.py       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mygpo/admin/urls.py b/mygpo/admin/urls.py
index ee005e67..9e0f46e8 100644
--- a/mygpo/admin/urls.py
+++ b/mygpo/admin/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 from mygpo.admin.views import Overview, MergeSelect, MergeVerify, \
          MergeProcess, MergeStatus, ClientStatsView, ClientStatsJsonView, \
diff --git a/mygpo/api/urls.py b/mygpo/api/urls.py
index 47e16f66..5c2762f1 100644
--- a/mygpo/api/urls.py
+++ b/mygpo/api/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('',
     (r'^upload$', 'mygpo.api.legacy.upload'),
diff --git a/mygpo/directory/urls.py b/mygpo/directory/urls.py
index 66131bf5..55da6109 100644
--- a/mygpo/directory/urls.py
+++ b/mygpo/directory/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 from mygpo.directory.views import Directory, Carousel, MissingPodcast, \
          AddPodcast, FlattrPodcastList
diff --git a/mygpo/publisher/urls.py b/mygpo/publisher/urls.py
index 66bd81ec..0d22cfd6 100644
--- a/mygpo/publisher/urls.py
+++ b/mygpo/publisher/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('mygpo.publisher.views',
  url(r'^$',                             'home',                        name='publisher'),
diff --git a/mygpo/share/urls.py b/mygpo/share/urls.py
index c0aa4f0d..50465cb5 100644
--- a/mygpo/share/urls.py
+++ b/mygpo/share/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 from mygpo.share.views import ShareFavorites, FavoritesPublic, \
          PublicSubscriptions, FavoritesFeedCreateEntry
diff --git a/mygpo/urls.py b/mygpo/urls.py
index 5ca52c0d..8f3b3282 100644
--- a/mygpo/urls.py
+++ b/mygpo/urls.py
@@ -16,7 +16,7 @@
 #
 
 import os.path
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 # This URLs should be always be served, even during maintenance mode
 urlpatterns = patterns('',
diff --git a/mygpo/userfeeds/urls.py b/mygpo/userfeeds/urls.py
index e6e29dd3..c30316d4 100644
--- a/mygpo/userfeeds/urls.py
+++ b/mygpo/userfeeds/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('mygpo.userfeeds.views',
  url(r'^user/(?P<username>[\w.-]+)/favorites.xml$', 'favorite_feed', name='favorites-feed'),
diff --git a/mygpo/web/urls.py b/mygpo/web/urls.py
index 1a76a789..1cadd38b 100644
--- a/mygpo/web/urls.py
+++ b/mygpo/web/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 from django.contrib.auth.views import logout
 from django.views.generic.simple import direct_to_template
 
-- 
2.11.4.GIT