aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rest_framework/tests/test_fields.py2
-rw-r--r--tox.ini4
2 files changed, 3 insertions, 3 deletions
diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py
index de371001..69a0468e 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 27db9a8a..aa97fd35 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