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/utils/__init__.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'rest_framework/utils/__init__.py')

diff --git a/rest_framework/utils/__init__.py b/rest_framework/utils/__init__.py
index 84fcb5db..a2406852 100644
--- a/rest_framework/utils/__init__.py
+++ b/rest_framework/utils/__init__.py
@@ -1,4 +1,8 @@
-from django.utils.encoding import smart_unicode
+
+try:
+    from django.utils.encoding import smart_text
+except ImportError:
+    from django.utils.encoding import smart_unicode as smart_text
 from django.utils.xmlutils import SimplerXMLGenerator
 from rest_framework.compat import StringIO
 import re
@@ -80,10 +84,10 @@ class XMLRenderer():
             pass
 
         else:
-            xml.characters(smart_unicode(data))
+            xml.characters(smart_text(data))
 
     def dict2xml(self, data):
-        stream = StringIO.StringIO()
+        stream = StringIO()
 
         xml = SimplerXMLGenerator(stream, "utf-8")
         xml.startDocument()
-- 
cgit v1.2.3