From 921e4ed2ee11edffd19d2ca40f10d47d2c148ea1 Mon Sep 17 00:00:00 2001
From: Paul Oswald
Date: Mon, 28 Jul 2014 16:59:55 +0900
Subject: Evaluate content before passing to regex.sub

Issue #1708
---
 rest_framework/utils/formatting.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'rest_framework/utils')

diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py
index 4b59ba84..12b79b6c 100644
--- a/rest_framework/utils/formatting.py
+++ b/rest_framework/utils/formatting.py
@@ -6,8 +6,6 @@ from __future__ import unicode_literals
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from rest_framework.compat import apply_markdown
-from rest_framework.settings import api_settings
-from textwrap import dedent
 import re
 
 
@@ -36,7 +34,7 @@ def dedent(content):
     # unindent the content if needed
     if whitespace_counts:
         whitespace_pattern = '^' + (' ' * min(whitespace_counts))
-        content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content)
+        content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', unicode(content))
 
     return content.strip()
 
-- 
cgit v1.2.3


From 66fa40c300b4d3e768b4a7993f020056c44fdda3 Mon Sep 17 00:00:00 2001
From: Paul Oswald
Date: Tue, 29 Jul 2014 22:13:11 +0900
Subject: evaluate content at function start

---
 rest_framework/utils/formatting.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'rest_framework/utils')

diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py
index 12b79b6c..2b3cbc95 100644
--- a/rest_framework/utils/formatting.py
+++ b/rest_framework/utils/formatting.py
@@ -28,13 +28,14 @@ def dedent(content):
     as it fails to dedent multiline docstrings that include
     unindented text on the initial line.
     """
+    content = unicode(content)
     whitespace_counts = [len(line) - len(line.lstrip(' '))
                          for line in content.splitlines()[1:] if line.lstrip()]
 
     # unindent the content if needed
     if whitespace_counts:
         whitespace_pattern = '^' + (' ' * min(whitespace_counts))
-        content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', unicode(content))
+        content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content)
 
     return content.strip()
 
-- 
cgit v1.2.3


From 3e93c96ece8af010185e1fe1188dd2df569d4528 Mon Sep 17 00:00:00 2001
From: Paul Oswald
Date: Tue, 19 Aug 2014 10:09:48 +0900
Subject: replace unicode call with force_text

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

(limited to 'rest_framework/utils')

diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py
index 2b3cbc95..40bced5f 100644
--- a/rest_framework/utils/formatting.py
+++ b/rest_framework/utils/formatting.py
@@ -5,6 +5,8 @@ from __future__ import unicode_literals
 
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
+from django.utils.encoding import force_text
+
 from rest_framework.compat import apply_markdown
 import re
 
@@ -28,7 +30,7 @@ def dedent(content):
     as it fails to dedent multiline docstrings that include
     unindented text on the initial line.
     """
-    content = unicode(content)
+    content = force_text(content)
     whitespace_counts = [len(line) - len(line.lstrip(' '))
                          for line in content.splitlines()[1:] if line.lstrip()]
 
-- 
cgit v1.2.3