@@ -12,7 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License."""
 
-from django.conf.urls.defaults import *
+try:
+    from django.conf.urls.defaults import *
+except ImportError:
+    from django.conf.urls import *
 
 urlpatterns = patterns('graphite.account.views',
   ('^login/?$', 'loginView'),
"""Copyright 2008 Orbitz WorldWide

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

   http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License."""

from django.conf.urls.defaults import *

urlpatterns = patterns('graphite.account.views',
  ('^login/?$', 'loginView'),
  ('^logout/?$', 'logoutView'),
  ('^edit/?$', 'editProfile'),
  ('^update/?$','updateProfile'),
)

Could you switch the order of the imports? `from django.conf.urls` is the future-proof one so it'd be nicer to have it first.