diff options
| author | Tom Christie | 2013-06-05 13:20:06 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-06-05 13:20:06 +0100 |
| commit | 2ca243a1144bb2a5461767a21ed14dec1d2b8dc2 (patch) | |
| tree | abc86fab5c7f0547bbbafe0b311b4fc94be16155 | |
| parent | f1251e8c58e86db11028396d79f01db5dfcf9e52 (diff) | |
| download | django-rest-framework-2ca243a1144bb2a5461767a21ed14dec1d2b8dc2.tar.bz2 | |
Fix up tests and tox
| -rw-r--r-- | rest_framework/tests/test_fields.py | 2 | ||||
| -rw-r--r-- | 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 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'}) @@ -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 |