From 74fec7eeb4e7e2e593ed5e2213020024264681ce Mon Sep 17 00:00:00 2001
From: Ian Foote
Date: Tue, 28 Jan 2014 14:30:46 +0000
Subject: Import force_bytes on django >= 1.5

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

(limited to 'rest_framework/compat.py')

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index b69749fe..d283e2f5 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -457,7 +457,7 @@ from django.test.client import RequestFactory as DjangoRequestFactory
 from django.test.client import FakePayload
 try:
     # In 1.5 the test client uses force_bytes
-    from django.utils.encoding import force_bytes_or_smart_bytes
+    from django.utils.encoding import force_bytes as force_bytes_or_smart_bytes
 except ImportError:
     # In 1.3 and 1.4 the test client just uses smart_str
     from django.utils.encoding import smart_str as force_bytes_or_smart_bytes
-- 
cgit v1.2.3


From 5ae94547bc08ade94c3f1df2223c0b8261cae59f Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Tue, 18 Feb 2014 11:42:17 +0100
Subject: Moved the python_2_unicode_compatible into compat module.

---
 rest_framework/compat.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'rest_framework/compat.py')

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index b69749fe..36f5653a 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -584,3 +584,23 @@ if six.PY3:
 else:
     def is_non_str_iterable(obj):
         return hasattr(obj, '__iter__')
+
+
+try:
+    from django.utils.encoding import python_2_unicode_compatible
+except ImportError:
+    def python_2_unicode_compatible(klass):
+        """
+        A decorator that defines __unicode__ and __str__ methods under Python 2.
+        Under Python 3 it does nothing.
+
+        To support Python 2 and 3 with a single code base, define a __str__ method
+        returning text and apply this decorator to the class.
+        """
+        if '__str__' not in klass.__dict__:
+            raise ValueError("@python_2_unicode_compatible cannot be applied "
+                             "to %s because it doesn't define __str__()." %
+                             klass.__name__)
+        klass.__unicode__ = klass.__str__
+        klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
+        return klass
-- 
cgit v1.2.3


From e0682e9298092721c0d3eb358ce4be8039e7ccf6 Mon Sep 17 00:00:00 2001
From: Eric Buehl
Date: Wed, 5 Mar 2014 17:15:52 +0000
Subject: don't implicitly import provider.oauth2

---
 rest_framework/compat.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'rest_framework/compat.py')

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 3089b7fb..f60a180d 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -550,13 +550,8 @@ except (ImportError, ImproperlyConfigured):
 
 # OAuth 2 support is optional
 try:
-    import provider.oauth2 as oauth2_provider
-    from provider.oauth2 import models as oauth2_provider_models
-    from provider.oauth2 import forms as oauth2_provider_forms
-    from provider import scope as oauth2_provider_scope
-    from provider import constants as oauth2_constants
-    from provider import __version__ as provider_version
-    if provider_version in ('0.2.3', '0.2.4'):
+    import provider as oauth2_provider
+    if oauth2_provider.__version__ in ('0.2.3', '0.2.4'):
         # 0.2.3 and 0.2.4 are supported version that do not support
         # timezone aware datetimes
         import datetime
@@ -566,10 +561,6 @@ try:
         from django.utils.timezone import now as provider_now
 except ImportError:
     oauth2_provider = None
-    oauth2_provider_models = None
-    oauth2_provider_forms = None
-    oauth2_provider_scope = None
-    oauth2_constants = None
     provider_now = None
 
 # Handle lazy strings
-- 
cgit v1.2.3


From 34887ed75625a58d00c986b3ea5526877f4724b2 Mon Sep 17 00:00:00 2001
From: Eric Buehl
Date: Thu, 6 Mar 2014 20:19:21 +0000
Subject: it's safe to import scope and constants

---
 rest_framework/compat.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'rest_framework/compat.py')

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index f60a180d..d155f554 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -551,6 +551,8 @@ except (ImportError, ImproperlyConfigured):
 # OAuth 2 support is optional
 try:
     import provider as oauth2_provider
+    from provider import scope as oauth2_provider_scope
+    from provider import constants as oauth2_constants
     if oauth2_provider.__version__ in ('0.2.3', '0.2.4'):
         # 0.2.3 and 0.2.4 are supported version that do not support
         # timezone aware datetimes
@@ -561,6 +563,8 @@ try:
         from django.utils.timezone import now as provider_now
 except ImportError:
     oauth2_provider = None
+    oauth2_provider_scope = None
+    oauth2_constants = None
     provider_now = None
 
 # Handle lazy strings
-- 
cgit v1.2.3