diff options
| author | Jharrod LaFon | 2014-09-05 15:30:01 -0700 | 
|---|---|---|
| committer | Jharrod LaFon | 2014-09-05 15:30:01 -0700 | 
| commit | baa518cd890103173dd18857c609432bd47c6be4 (patch) | |
| tree | 63d417b45767d3b01180c977e2efcc94ca8a344a /tests/conftest.py | |
| parent | f4e02446f99cef42f18f57a2712c435a84451868 (diff) | |
| download | django-rest-framework-baa518cd890103173dd18857c609432bd47c6be4.tar.bz2 | |
Moved OAuth support out of DRF and into a separate package, per #1767
Diffstat (limited to 'tests/conftest.py')
| -rw-r--r-- | tests/conftest.py | 20 | 
1 files changed, 0 insertions, 20 deletions
| diff --git a/tests/conftest.py b/tests/conftest.py index 4b33e19c..67986621 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -47,26 +47,6 @@ def pytest_configure():          ),      ) -    try: -        import oauth_provider  # NOQA -        import oauth2  # NOQA -    except ImportError: -        pass -    else: -        settings.INSTALLED_APPS += ( -            'oauth_provider', -        ) - -    try: -        import provider  # NOQA -    except ImportError: -        pass -    else: -        settings.INSTALLED_APPS += ( -            'provider', -            'provider.oauth2', -        ) -      # guardian is optional      try:          import guardian  # NOQA | 
