encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-01-24 00:04:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix up tests and tox

Browse Source
This commit is contained in:
Tom Christie 2013-06-05 13:20:06 +01:00
parent f1251e8c58
commit 2ca243a114
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/tests/test_fields.py
View File

@ -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'})

4
tox.ini
View File

@ -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