diff options
| author | Mark Aaron Shirley | 2012-12-19 15:21:06 -0800 |
|---|---|---|
| committer | Mark Aaron Shirley | 2012-12-19 15:21:06 -0800 |
| commit | ef475eb9bd7754c7248642b4a41093e2d6493b03 (patch) | |
| tree | bc0faeb5cd04f02cf2cfa8db84fade4452549c0c /rest_framework/compat.py | |
| parent | ae6ca7456feda199124eb78f7872f969fa67d7b8 (diff) | |
| parent | c27295dcbdf89b3cbc10d6325833e428c66c0f2a (diff) | |
| download | django-rest-framework-ef475eb9bd7754c7248642b4a41093e2d6493b03.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into writable-serializers
Diffstat (limited to 'rest_framework/compat.py')
| -rw-r--r-- | rest_framework/compat.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/rest_framework/compat.py b/rest_framework/compat.py index d4901437..86952fb8 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -5,6 +5,12 @@ versions of django/python, and compatibility wrappers around optional packages. # flake8: noqa import django +# location of patterns, url, include changes in 1.4 onwards +try: + from django.conf.urls import patterns, url, include +except: + from django.conf.urls.defaults import patterns, url, include + # django-filter is optional try: import django_filters |