summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dpmcgee@gmail.com>2012-03-25 15:05:01 -0500
committerDan McGee <dpmcgee@gmail.com>2012-03-25 15:05:01 -0500
commit5dc738149a73bc52afd5ed8cdf0bf62a041782e0 (patch)
tree3bcb3b87bf2d38ab9d96fcef608fae5b18abb3aa
parent29dafb3f803995fbcbe5f7ae610b7d76fb053f67 (diff)
downloadwebsite-5dc738149a73bc52afd5ed8cdf0bf62a041782e0.tar.gz
website-5dc738149a73bc52afd5ed8cdf0bf62a041782e0.zip
Adjust urls imports for Django 1.4
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
-rw-r--r--blog/urls.py2
-rw-r--r--urls.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/blog/urls.py b/blog/urls.py
index 01cbfdd..4047a99 100644
--- a/blog/urls.py
+++ b/blog/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
from django.db.models import Count
from blog.models import Post, PostCategory
diff --git a/urls.py b/urls.py
index 4edb275..daaca00 100644
--- a/urls.py
+++ b/urls.py
@@ -1,6 +1,6 @@
-from django.conf.urls.defaults import include, patterns
+from django.conf.urls import include, patterns
# we need these until http://code.djangoproject.com/ticket/5350 is fixed
-from django.conf.urls.defaults import handler404, handler500
+from django.conf.urls import handler404, handler500
from django.conf import settings
from django.contrib import admin
from feeds import BlogRss, BlogAtom