diff options
| author | Tom Christie | 2013-09-10 20:21:15 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-09-10 20:21:15 +0100 |
| commit | 75fb4b02b40da04f16c6c288bbe20ea0bc0b4154 (patch) | |
| tree | 97e7b26506eed113a15d00ae8e9d8f438e0bef60 /rest_framework/compat.py | |
| parent | f5c34926d6a4b4b29fb083d25b99b10d7431eee4 (diff) | |
| parent | 23fc9dd53fcd9cc25e2c77e5ffae395f04d4990d (diff) | |
| download | django-rest-framework-75fb4b02b40da04f16c6c288bbe20ea0bc0b4154.tar.bz2 | |
Merge branch 'master' of git://github.com/bwreilly/django-rest-framework into bwreilly-master
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 6f7447ad..b9d1dae6 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -47,6 +47,12 @@ try: except ImportError: django_filters = None +# guardian is optional +try: + import guardian +except ImportError: + guardian = None + # cStringIO only if it's available, otherwise StringIO try: |