From b3698acb6c0b9eaa04189599e27014c788a75adc Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Thu, 22 Nov 2012 00:20:49 +0100
Subject: First passing test under p3k \o/

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

(limited to 'rest_framework/settings.py')

diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index ee24a4ad..9e73bbfb 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -19,6 +19,8 @@ back to the defaults.
 """
 from django.conf import settings
 from django.utils import importlib
+from six import string_types
+
 
 
 USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None)
@@ -98,7 +100,7 @@ def perform_import(val, setting_name):
     If the given setting is a string import notation,
     then perform the necessary import or imports.
     """
-    if isinstance(val, basestring):
+    if isinstance(val, string_types):
         return import_from_string(val, setting_name)
     elif isinstance(val, (list, tuple)):
         return [import_from_string(item, setting_name) for item in val]
-- 
cgit v1.2.3


From 60250f22c8e144494f372338c16a2167cccb319d Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Thu, 3 Jan 2013 11:41:07 +0100
Subject: Move the various compat things to the compat module.

---
 rest_framework/settings.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'rest_framework/settings.py')

diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index 9e73bbfb..186833b5 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -19,8 +19,7 @@ back to the defaults.
 """
 from django.conf import settings
 from django.utils import importlib
-from six import string_types
-
+from rest_framework.compat import six
 
 
 USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None)
@@ -100,7 +99,7 @@ def perform_import(val, setting_name):
     If the given setting is a string import notation,
     then perform the necessary import or imports.
     """
-    if isinstance(val, string_types):
+    if isinstance(val, six.string_types):
         return import_from_string(val, setting_name)
     elif isinstance(val, (list, tuple)):
         return [import_from_string(item, setting_name) for item in val]
@@ -118,6 +117,7 @@ def import_from_string(val, setting_name):
         module = importlib.import_module(module_path)
         return getattr(module, class_name)
     except:
+        raise
         msg = "Could not import '%s' for API setting '%s'" % (val, setting_name)
         raise ImportError(msg)
 
-- 
cgit v1.2.3


From 510d6a3c5540bbc20406ff79ce5f95d97b2a63f3 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Mon, 7 Jan 2013 23:26:14 +0100
Subject: Introduced HTTP_HEADER_ENCODING.

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

(limited to 'rest_framework/settings.py')

diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index 186833b5..2358d188 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -75,6 +75,9 @@ DEFAULTS = {
     'URL_FORMAT_OVERRIDE': 'format',
 
     'FORMAT_SUFFIX_KWARG': 'format',
+
+    # Header encoding (see RFC5987)
+    'HTTP_HEADER_ENCODING': 'iso-8859-1',
 }
 
 
-- 
cgit v1.2.3