tox: Add tox.ini file

[patchwork] / apps / patchwork / urls.py

diff --git a/apps/patchwork/urls.py b/apps/patchwork/urls.py
index a44f17cd88195059833fbc1f03ea4c2144629c92..b28eb90ba6b03245d5a960e6df269bba305b649c 100644 (file)
--- a/apps/patchwork/urls.py
+++ b/apps/patchwork/urls.py
@@ -17,12 +17,16 @@
 # along with Patchwork; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-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.contrib.auth import views as auth_views
 
+admin.autodiscover()
+
 urlpatterns = patterns('',
-    # Example:
+    url(r'^admin/', include(admin.site.urls)),
+
     (r'^$', 'patchwork.views.projects'),
     (r'^project/(?P<project_id>[^/]+)/list/$', 'patchwork.views.patch.list'),
     (r'^project/(?P<project_id>[^/]+)/$', 'patchwork.views.project.project'),
@@ -45,9 +49,9 @@ urlpatterns = patterns('',
 
     # password change
     url(r'^user/password-change/$', auth_views.password_change,
-            name='auth_password_change'),
+            name='password_change'),
     url(r'^user/password-change/done/$', auth_views.password_change_done,
-            name='auth_password_change_done'),
+            name='password_change_done'),
 
     # login/logout
     url(r'^user/login/$', auth_views.login,