From 2ca243a1144bb2a5461767a21ed14dec1d2b8dc2 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 5 Jun 2013 13:20:06 +0100 Subject: [PATCH] Fix up tests and tox --- rest_framework/tests/test_fields.py | 2 +- tox.ini | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py index de3710011..69a0468e0 100644 --- a/rest_framework/tests/test_fields.py +++ b/rest_framework/tests/test_fields.py @@ -865,4 +865,4 @@ class FieldCallableDefault(TestCase): field = serializers.WritableField(default=self.simple_callable) into = {} field.field_from_native({}, {}, 'field', into) - self.assertEquals(into, {'field': 'foo bar'}) + self.assertEqual(into, {'field': 'foo bar'}) diff --git a/tox.ini b/tox.ini index 27db9a8a6..aa97fd350 100644 --- a/tox.ini +++ b/tox.ini @@ -24,7 +24,7 @@ deps = https://www.djangoproject.com/download/1.6a1/tarball/ defusedxml==0.3 django-oauth-plus==2.0 oauth2==1.5.211 - django-oauth2-provider==0.2.3 + django-oauth2-provider==0.2.4 [testenv:py2.6-django1.6] basepython = python2.6 @@ -33,7 +33,7 @@ deps = https://www.djangoproject.com/download/1.6a1/tarball/ defusedxml==0.3 django-oauth-plus==2.0 oauth2==1.5.211 - django-oauth2-provider==0.2.3 + django-oauth2-provider==0.2.4 [testenv:py3.3-django1.5] basepython = python3.3