diff options
| author | Pierre Dulac | 2013-03-01 11:53:30 +0100 |
|---|---|---|
| committer | Pierre Dulac | 2013-03-01 11:53:30 +0100 |
| commit | 9d5c3060386cc8deb4ee55eda022f0a134e897c0 (patch) | |
| tree | d1e36104f7cdc6f3980d630ac58299e148ddcc78 /rest_framework/compat.py | |
| parent | aed3c13471deae6b2837b3799b4ca6615a5d172c (diff) | |
| download | django-rest-framework-9d5c3060386cc8deb4ee55eda022f0a134e897c0.tar.bz2 | |
Improve the `django-oauth2-provider` import block
to avoid naming collision with `oauth2` used for OAuth 1
Diffstat (limited to 'rest_framework/compat.py')
| -rw-r--r-- | rest_framework/compat.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 5bba0c86..e0a43f3f 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -430,10 +430,6 @@ except ImportError: # OAuth 2 support is optional try: - import provider as oauth2_provider + import provider.oauth2 as oauth2_provider except ImportError: oauth2_provider = None -try: - import provider.oauth2 as oauth2 -except ImportError: - oauth2 = None |