diff options
| author | Xavier Ordoquy | 2013-01-02 16:09:21 +0100 | 
|---|---|---|
| committer | Xavier Ordoquy | 2013-01-02 16:09:21 +0100 | 
| commit | 737349d2389197d23886b72c1cb44f53c501ac9a (patch) | |
| tree | 0c542b6c73deee0280705c8253334126c5f5d254 /rest_framework/urls.py | |
| parent | 5fad46d7e213afed503b1533515cab96875a5936 (diff) | |
| parent | d379997aba5b1e41309bbed8740ed704c0feb58b (diff) | |
| download | django-rest-framework-737349d2389197d23886b72c1cb44f53c501ac9a.tar.bz2 | |
Merge remote-tracking branch 'reference/py3k' into p3k
Diffstat (limited to 'rest_framework/urls.py')
| -rw-r--r-- | rest_framework/urls.py | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/urls.py b/rest_framework/urls.py index bcdc23e7..fbe4bc07 100644 --- a/rest_framework/urls.py +++ b/rest_framework/urls.py @@ -12,7 +12,7 @@ your authentication settings include `SessionAuthentication`.          url(r'^auth', include('rest_framework.urls', namespace='rest_framework'))      )  """ -from django.conf.urls.defaults import patterns, url +from rest_framework.compat import patterns, url  template_name = {'template_name': 'rest_framework/login.html'}  | 
