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


From e348ee92552aab51290dfe6b256ad03b8d62e6f9 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Fri, 23 Nov 2012 01:12:33 +0100
Subject: 52 tests passing. Refactored a few string / byte io.

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

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

diff --git a/rest_framework/tests/files.py b/rest_framework/tests/files.py
index e7609706..a69695ca 100644
--- a/rest_framework/tests/files.py
+++ b/rest_framework/tests/files.py
@@ -1,4 +1,4 @@
-from rest_framework.compat import StringIO
+from rest_framework.compat import BytesIO
 
 import datetime
 
@@ -29,9 +29,9 @@ class FileSerializerTests(TestCase):
 
     def test_create(self):
         now = datetime.datetime.now()
-        file = StringIO('stuff')
+        file = BytesIO(b'stuff')
         file.name = 'stuff.txt'
-        file.size = file.len
+        file.size = len(file.getvalue())
         serializer = UploadedFileSerializer(data={'created': now}, files={'file': file})
         uploaded_file = UploadedFile(file=file, created=now)
         self.assertTrue(serializer.is_valid())
-- 
cgit v1.2.3


From 17000129e35b10c9d08497a669fd72f8233f065a Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Sat, 24 Nov 2012 23:19:03 +0100
Subject: Every (base) test should now pass with python3.

---
 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 a69695ca..42e8ed5f 100644
--- a/rest_framework/tests/files.py
+++ b/rest_framework/tests/files.py
@@ -1,6 +1,7 @@
 from rest_framework.compat import BytesIO
 
 import datetime
+import six
 
 from django.test import TestCase
 
@@ -29,7 +30,7 @@ class FileSerializerTests(TestCase):
 
     def test_create(self):
         now = datetime.datetime.now()
-        file = BytesIO(b'stuff')
+        file = BytesIO(six.b('stuff'))
         file.name = 'stuff.txt'
         file.size = len(file.getvalue())
         serializer = UploadedFileSerializer(data={'created': now}, files={'file': file})
-- 
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/tests/files.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/rest_framework/tests/files.py b/rest_framework/tests/files.py
index 42e8ed5f..ca6bc905 100644
--- a/rest_framework/tests/files.py
+++ b/rest_framework/tests/files.py
@@ -1,11 +1,10 @@
-from rest_framework.compat import BytesIO
-
 import datetime
-import six
 
 from django.test import TestCase
 
 from rest_framework import serializers
+from rest_framework.compat import BytesIO
+from rest_framework.compat import six
 
 
 class UploadedFile(object):
-- 
cgit v1.2.3