diff options
| author | Tom Christie | 2012-12-27 20:20:01 +0000 |
|---|---|---|
| committer | Tom Christie | 2012-12-27 20:20:01 +0000 |
| commit | eefd5b05fbd7639fa813728bde44f1614875866e (patch) | |
| tree | bbc5d831a539bb991801419af6baa156c4d039b4 /rest_framework | |
| parent | 4b32cda5a8a32bf43e80dfbe6d9d17a07b20152c (diff) | |
| download | django-rest-framework-eefd5b05fbd7639fa813728bde44f1614875866e.tar.bz2 | |
Use compat import of urlpatterns
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/runtests/urls.py | 2 | ||||
| -rw-r--r-- | rest_framework/tests/modelviews.py | 2 | ||||
| -rw-r--r-- | rest_framework/urlpatterns.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/rest_framework/runtests/urls.py b/rest_framework/runtests/urls.py index 4b7da787..ed5baeae 100644 --- a/rest_framework/runtests/urls.py +++ b/rest_framework/runtests/urls.py @@ -1,7 +1,7 @@ """ Blank URLConf just to keep runtests.py happy. """ -from django.conf.urls.defaults import * +from rest_framework.compat import patterns urlpatterns = patterns('', ) diff --git a/rest_framework/tests/modelviews.py b/rest_framework/tests/modelviews.py index 1f8468e8..f12e3b97 100644 --- a/rest_framework/tests/modelviews.py +++ b/rest_framework/tests/modelviews.py @@ -1,4 +1,4 @@ -# from django.conf.urls.defaults import patterns, url +# from rest_framework.compat import patterns, url # from django.forms import ModelForm # from django.contrib.auth.models import Group, User # from rest_framework.resources import ModelResource diff --git a/rest_framework/urlpatterns.py b/rest_framework/urlpatterns.py index 0ad926fa..143928c9 100644 --- a/rest_framework/urlpatterns.py +++ b/rest_framework/urlpatterns.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import url +from rest_framework.compat import url from rest_framework.settings import api_settings |