diff options
| author | Philip Douglas | 2013-09-13 10:47:06 +0100 |
|---|---|---|
| committer | Philip Douglas | 2013-09-13 10:47:06 +0100 |
| commit | e5da0ff5e530c8ea0e2cf4dff0723ede6234860e (patch) | |
| tree | 776ec2dd47b6c8a4aa976d33c740d4b0267c9522 /rest_framework/compat.py | |
| parent | 272a6abf91c51b44781d27af5352c7e36c8fa91c (diff) | |
| parent | ea462b7b9b28f425c8c91d10e34532ddbb3c87fa (diff) | |
| download | django-rest-framework-e5da0ff5e530c8ea0e2cf4dff0723ede6234860e.tar.bz2 | |
Merge remote-tracking branch 'upstream/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: |