# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1336095916 18000
# Node ID ddd69a8e07c76497411511a4a82cfc10c8269476
# Parent  bcc4e8cf841b2ac41762cf1a69235fefdb9e57df
For Django 1.4, use django.conf.urls instead of django.conf.urls.defaults.

diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/accounts/urls.py
--- a/gpp/accounts/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/accounts/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,5 +1,5 @@
 """urls for the accounts application"""
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 from django.conf import settings
 
 urlpatterns = patterns('accounts.views',
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/antispam/urls.py
--- a/gpp/antispam/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/antispam/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,5 +1,5 @@
 """URLs for the antispam application."""
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('antispam.views',
     url(r'^suspended/$', 'suspended', name='antispam-suspended'),
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/bio/urls.py
--- a/gpp/bio/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/bio/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,5 +1,5 @@
 """urls for the bio application"""
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('bio.views',
     url(r'^members/(?P<type>user|date)/$',
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/comments/urls.py
--- a/gpp/comments/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/comments/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,7 +1,7 @@
 """
 URLs for the comments application.
 """
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('comments.views',
     url(r'^flag/$', 'flag_comment', name='comments-flag'),
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/contact/urls.py
--- a/gpp/contact/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/contact/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,5 +1,5 @@
 """urls for the contact application"""
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('contact.views',
    url(r'^$', 'contact_form', name='contact-form'),
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/contests/urls.py
--- a/gpp/contests/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/contests/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -2,7 +2,7 @@
 Url patterns for the contests application.
 
 """
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.views.generic import DetailView, ListView
 
 from contests.models import Contest
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/core/urls.py
--- a/gpp/core/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/core/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,7 +1,7 @@
 """
 Urls for the core application.
 """
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('core.views',
     url(r'^markdown_help/$', 'markdown_help', name='core-markdown_help'),
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/donations/urls.py
--- a/gpp/donations/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/donations/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,7 +1,7 @@
 """
 URLs for the donations application.
 """
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 from django.views.generic import TemplateView
 
 urlpatterns = patterns('donations.views',
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/downloads/urls.py
--- a/gpp/downloads/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/downloads/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,7 +1,7 @@
 """
 URLs for the downloads application.
 """
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('downloads.views',
     url(r'^$', 'index', name='downloads-index'),
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/forums/urls.py
--- a/gpp/forums/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/forums/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,7 +1,7 @@
 """
 URLs for the forums application.
 """
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('forums.views.main',
     url(r'^$', 'index', name='forums-index'),
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/gcalendar/admin.py
--- a/gpp/gcalendar/admin.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/gcalendar/admin.py	Thu May 03 20:45:16 2012 -0500
@@ -2,18 +2,14 @@
 This file contains the automatic admin site definitions for the gcalendar application.
 
 """
-import datetime
-
 from django.conf import settings
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 from django.contrib import admin
 from django.contrib import messages
 from django.contrib.sites.models import Site
 from django.core.urlresolvers import reverse
-from django.http import HttpResponse
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
-from django.template import RequestContext
 
 import gdata.client
 
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/gcalendar/urls.py
--- a/gpp/gcalendar/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/gcalendar/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,7 +1,7 @@
 """
 URLs for the gcalendar application.
 """
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('gcalendar.views',
     url(r'^$', 'index', name='gcalendar-index'),
@@ -12,4 +12,3 @@
     url(r'^thanks/add/$', 'add_thanks', name='gcalendar-add_thanks'),
     url(r'^thanks/change/$', 'edit_thanks', name='gcalendar-edit_thanks'),
 )
-# vim: ts=4 sw=4
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/irc/urls.py
--- a/gpp/irc/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/irc/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,5 +1,5 @@
 """urls for the IRC application"""
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('irc.views',
    url(r'^$', 'view', name='irc-main'),
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/membermap/urls.py
--- a/gpp/membermap/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/membermap/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,7 +1,7 @@
 """
 URLs for the member map application.
 """
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('membermap.views',
     url(r'^$', 'index', name='membermap-index'),
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/messages/urls.py
--- a/gpp/messages/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/messages/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,5 +1,5 @@
 """urls for the Messages application"""
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('messages.views',
     url(r'^$',
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/news/urls.py
--- a/gpp/news/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/news/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,5 +1,5 @@
 """urls for the News application"""
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('news.views',
     url(r'^date/$', 'index', name='news-index_page'),
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/oembed/urls.py
--- a/gpp/oembed/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/oembed/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,7 +1,7 @@
 """
 URLs for the oembed application.
 """
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('oembed.views',
     url(r'^fetch/$', 'fetch_media', name='oembed-fetch_media'),
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/phantombrigade/urls.py
--- a/gpp/phantombrigade/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/phantombrigade/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -2,7 +2,7 @@
 Url patterns for the phantombrigade application.
 
 """
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 
 urlpatterns = patterns('phantombrigade.views',
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/podcast/urls.py
--- a/gpp/podcast/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/podcast/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -2,7 +2,7 @@
 urls for the podcast application
 
 """
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 from django.views.decorators.cache import cache_page
 
 from podcast.views import feed
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/polls/urls.py
--- a/gpp/polls/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/polls/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,5 +1,5 @@
 """urls for the polls application"""
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('polls.views',
     url(r'^$', 'poll_index', name='polls-main'),
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/potd/urls.py
--- a/gpp/potd/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/potd/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,7 +1,7 @@
 """
 URLs for the POTD application.
 """
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('potd.views',
     url(r'^$', 'view', name='potd-view'),
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/shoutbox/urls.py
--- a/gpp/shoutbox/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/shoutbox/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -2,7 +2,7 @@
 Urls for the Shoutbox application.
 """
 
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('shoutbox.views',
     url(r'^delete/$', 'delete', name='shoutbox-delete'),
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/smiley/urls.py
--- a/gpp/smiley/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/smiley/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -2,7 +2,7 @@
 Urls for the Smiley application.
 """
 
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('smiley.views',
     url(r'^farm/$', 'farm', name='smiley-farm'),
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/urls.py
--- a/gpp/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url, include
 from django.conf import settings
 from django.contrib import admin
 from django.views.decorators.cache import cache_page
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/weblinks/urls.py
--- a/gpp/weblinks/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/weblinks/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -1,5 +1,5 @@
 """urls for the weblinks application"""
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns('weblinks.views',
    url(r'^$', 'link_index', name='weblinks-main'),
diff -r bcc4e8cf841b -r ddd69a8e07c7 gpp/ygroup/urls.py
--- a/gpp/ygroup/urls.py	Wed May 02 21:00:12 2012 -0500
+++ b/gpp/ygroup/urls.py	Thu May 03 20:45:16 2012 -0500
@@ -2,10 +2,10 @@
 urls.py - URLs for the ygroup application.
 
 """
-from django.conf.urls.defaults import *
-from django.views.generic import ListView, DetailView
+from django.conf.urls import patterns, url
+from django.views.generic import DetailView
 
-from ygroup.models import Thread, Post
+from ygroup.models import Post
 from ygroup.views import ThreadIndexView, ThreadView