Merge pull request #1770 from tomchristie/2.4.0

2.4.0 Release.

1 files changed, 7 insertions, 5 deletions

diff --git a/rest_framework/urls.py b/rest_framework/urls.py
index 5d70f899..8fa3073e 100644
--- a/rest_framework/urls.py
+++ b/rest_framework/urls.py
@@ -8,17 +8,19 @@ your API requires authentication:
         ...
         url(r'^auth', include('rest_framework.urls', namespace='rest_framework'))
     )
-    
+
 The urls must be namespaced as 'rest_framework', and you should make sure
 your authentication settings include `SessionAuthentication`.
 """
 from __future__ import unicode_literals
-from rest_framework.compat import patterns, url
+from django.conf.urls import patterns, url
+from django.contrib.auth import views
 
 
 template_name = {'template_name': 'rest_framework/login.html'}
 
-urlpatterns = patterns('django.contrib.auth.views',
-    url(r'^login/$', 'login', template_name, name='login'),
-    url(r'^logout/$', 'logout', template_name, name='logout'),
+urlpatterns = patterns(
+    '',
+    url(r'^login/$', views.login, template_name, name='login'),
+    url(r'^logout/$', views.logout, template_name, name='logout')
 )