aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/files.py
diff options
context:
space:
mode:
authorTom Christie2013-02-27 13:15:47 -0800
committerTom Christie2013-02-27 13:15:47 -0800
commita2dafd96439afc958b0e3dafdf543ca9843fd0d2 (patch)
tree68ea6caa6c0a84bd93fe70a10b003fd7109bf1c0 /rest_framework/tests/files.py
parent35331f5820cff9a5cd97ccff2c1cbbb8a5a62790 (diff)
parenta1dbd93f5467a8a25e18516f57f34c15b3b31b36 (diff)
downloaddjango-rest-framework-a2dafd96439afc958b0e3dafdf543ca9843fd0d2.tar.bz2
Merge pull request #692 from tomchristie/django1.5
Django 1.5
Diffstat (limited to 'rest_framework/tests/files.py')
-rw-r--r--rest_framework/tests/files.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/tests/files.py b/rest_framework/tests/files.py
index ce00ea6b..487046ac 100644
--- a/rest_framework/tests/files.py
+++ b/rest_framework/tests/files.py
@@ -33,8 +33,8 @@ class FileSerializerTests(TestCase):
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):