summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/views_survex.py2
-rw-r--r--profiles/urls.py2
-rw-r--r--urls.py4
3 files changed, 4 insertions, 4 deletions
diff --git a/core/views_survex.py b/core/views_survex.py
index 3c53625..28a4370 100644
--- a/core/views_survex.py
+++ b/core/views_survex.py
@@ -257,7 +257,7 @@ def identifycavedircontents(gcavedir):
# perhaps should use the database and have a reload button for it
def survexcaveslist(request):
cavesdir = os.path.join(settings.SURVEX_DATA, "caves")
- cavesdircontents = { }
+ #cavesdircontents = { }
onefilecaves = [ ]
multifilecaves = [ ]
diff --git a/profiles/urls.py b/profiles/urls.py
index a703e9b..d10894d 100644
--- a/profiles/urls.py
+++ b/profiles/urls.py
@@ -22,7 +22,7 @@ redirect. If you don't use that name, remember to explicitly pass
"""
-from django.conf.urls.defaults import *
+from django.conf.urls import *
from profiles import views
diff --git a/urls.py b/urls.py
index c26c4dd..d7e8b3b 100644
--- a/urls.py
+++ b/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
from django.conf import settings
from core.views import * # flat import
@@ -95,7 +95,7 @@ actualurlpatterns = patterns('',
url(r'^troggle/media-admin/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ADMIN_DIR, 'show_indexes':True}),
- (r'^accounts/', include('registration.urls')),
+ (r'^accounts/', include('registration.backends.default.urls')),
(r'^profiles/', include('profiles.urls')),