diff options
| author | Tom Christie | 2012-12-19 23:12:27 +0000 |
|---|---|---|
| committer | Tom Christie | 2012-12-19 23:12:27 +0000 |
| commit | a493c83248535c9fa7f78815b16bce7e88bf7966 (patch) | |
| tree | b52e34b8b6ecfcc08f0135bc0a503b939e53a3ec /rest_framework/compat.py | |
| parent | c097bcef586da4513d1d6f357d9eb3d7b4b0fffb (diff) | |
| download | django-rest-framework-a493c83248535c9fa7f78815b16bce7e88bf7966.tar.bz2 | |
urls, patterns, include imports move to compat to support incoming 1.3 thru 1.6 import compatability
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 |