aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Leis <engineergod@yahoo.com>2014-01-07 11:32:12 -0800
committerEvan Leis <engineergod@yahoo.com>2014-01-07 11:32:12 -0800
commitfe09a347413b50158476c5c37abfc5bd55b8da87 (patch)
treed207ea478bd438f23a1861af27c9c647ef5e5a9c
parent80e4a0888c6ecd2951e432cf89b58e271a25679a (diff)
parent91f2d2a511e106313f301c9625945284c0a1e525 (diff)
downloadezfacebook-master.zip
ezfacebook-master.tar.gz
Merge pull request #1 from cuu508/masterHEADmaster
Django 1.6 support
-rw-r--r--ezfacebook/context/urls.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/ezfacebook/context/urls.py b/ezfacebook/context/urls.py
index cfd9d3e..1374764 100644
--- a/ezfacebook/context/urls.py
+++ b/ezfacebook/context/urls.py
@@ -6,7 +6,12 @@ facebook-channel-url: URL to "channel.html" i.e. //mysitedomain.com/facebookchan
"""
-from django.conf.urls.defaults import patterns, url
+try:
+ from django.conf.urls.defaults import patterns, url
+except ImportError:
+ # Django 1.6 removes the defaults module.
+ # See https://docs.djangoproject.com/en/1.6/internals/deprecation/#id1
+ from django.conf.urls import patterns, url
from . import views