From 4e1f77db1ae48b156cb163a0853776cc23e230b5 Mon Sep 17 00:00:00 2001
From: Pierre Dulac
Date: Fri, 1 Mar 2013 02:07:53 +0100
Subject: Add django-oauth2-provider to the installed apps

---
 rest_framework/runtests/settings.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'rest_framework/runtests/settings.py')

diff --git a/rest_framework/runtests/settings.py b/rest_framework/runtests/settings.py
index 03bfc216..67dc7fff 100644
--- a/rest_framework/runtests/settings.py
+++ b/rest_framework/runtests/settings.py
@@ -97,7 +97,9 @@ INSTALLED_APPS = (
     # 'django.contrib.admindocs',
     'rest_framework',
     'rest_framework.authtoken',
-    'rest_framework.tests'
+    'rest_framework.tests',
+    'provider',
+    'provider.oauth2',
 )
 
 STATIC_URL = '/static/'
-- 
cgit v1.2.3


From cda21a306e8fdb713d26726964be10e2862140c3 Mon Sep 17 00:00:00 2001
From: Pierre Dulac
Date: Sat, 2 Mar 2013 20:20:26 +0100
Subject: Only add the django-oauth2-provider apps if the module is installed

otherwise log a warning
---
 rest_framework/runtests/settings.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'rest_framework/runtests/settings.py')

diff --git a/rest_framework/runtests/settings.py b/rest_framework/runtests/settings.py
index 67dc7fff..b1501cf3 100644
--- a/rest_framework/runtests/settings.py
+++ b/rest_framework/runtests/settings.py
@@ -98,10 +98,18 @@ INSTALLED_APPS = (
     'rest_framework',
     'rest_framework.authtoken',
     'rest_framework.tests',
-    'provider',
-    'provider.oauth2',
 )
 
+try:
+    import provider
+    INSTALLED_APPS += (
+        'provider',
+        'provider.oauth2',
+    )
+except ImportError, inst:
+    import logging
+    logging.warning("django-oauth2-provider is not install, some tests will be skipped")
+
 STATIC_URL = '/static/'
 
 PASSWORD_HASHERS = (
-- 
cgit v1.2.3


From 8845c0be88bf68fa0e42d05c7196cd52d897623b Mon Sep 17 00:00:00 2001
From: Pierre Dulac
Date: Sun, 3 Mar 2013 01:09:39 +0100
Subject: Fix import errors

---
 rest_framework/runtests/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/runtests/settings.py')

diff --git a/rest_framework/runtests/settings.py b/rest_framework/runtests/settings.py
index b1501cf3..16ef1d2b 100644
--- a/rest_framework/runtests/settings.py
+++ b/rest_framework/runtests/settings.py
@@ -106,7 +106,7 @@ try:
         'provider',
         'provider.oauth2',
     )
-except ImportError, inst:
+except ImportError:
     import logging
     logging.warning("django-oauth2-provider is not install, some tests will be skipped")
 
-- 
cgit v1.2.3