Merge branch 'master' into resources-routers

1 files changed, 8 insertions, 8 deletions

diff --git a/rest_framework/tests/files.py b/rest_framework/tests/files.py
index 446e23c0..487046ac 100644
--- a/rest_framework/tests/files.py
+++ b/rest_framework/tests/files.py
@@ -1,9 +1,9 @@
-import StringIO
-import datetime
-
+from __future__ import unicode_literals
 from django.test import TestCase
-
 from rest_framework import serializers
+from rest_framework.compat import BytesIO
+from rest_framework.compat import six
+import datetime
 
 
 class UploadedFile(object):
@@ -27,14 +27,14 @@ class UploadedFileSerializer(serializers.Serializer):
 class FileSerializerTests(TestCase):
     def test_create(self):
         now = datetime.datetime.now()
-        file = StringIO.StringIO('stuff')
+        file = BytesIO(six.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())
-        self.assertEquals(serializer.object.created, uploaded_file.created)
-        self.assertEquals(serializer.object.file, uploaded_file.file)
+        self.assertEqual(serializer.object.created, uploaded_file.created)
+        self.assertEqual(serializer.object.file, uploaded_file.file)
         self.assertFalse(serializer.object is uploaded_file)
 
     def test_creation_failure(self):