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/tests/files.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'rest_framework/tests/files.py')

diff --git a/rest_framework/tests/files.py b/rest_framework/tests/files.py
index 5dd57b7c..027aecf7 100644
--- a/rest_framework/tests/files.py
+++ b/rest_framework/tests/files.py
@@ -1,4 +1,5 @@
-import StringIO
+from rest_framework.compat import StringIO
+
 import datetime
 
 from django.test import TestCase
-- 
cgit v1.2.3


From 49f8e6419ad79a27c462eb4b0690f139ab8091de Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Thu, 22 Nov 2012 00:43:56 +0100
Subject: Fixed python2.7 compat issue.

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

(limited to 'rest_framework/tests/files.py')

diff --git a/rest_framework/tests/files.py b/rest_framework/tests/files.py
index 027aecf7..e7609706 100644
--- a/rest_framework/tests/files.py
+++ b/rest_framework/tests/files.py
@@ -29,7 +29,7 @@ class FileSerializerTests(TestCase):
 
     def test_create(self):
         now = datetime.datetime.now()
-        file = StringIO.StringIO('stuff')
+        file = StringIO('stuff')
         file.name = 'stuff.txt'
         file.size = file.len
         serializer = UploadedFileSerializer(data={'created': now}, files={'file': file})
-- 
cgit v1.2.3