Merge branch 'version-3.1' into oauth_as_package

Conflicts:
	requirements-test.txt
	rest_framework/compat.py
	tests/settings.py
	tox.ini

1 files changed, 0 insertions, 15 deletions

diff --git a/tests/test_serializer_empty.py b/tests/test_serializer_empty.py
deleted file mode 100644
index 805ac7d4..00000000
--- a/tests/test_serializer_empty.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# from django.test import TestCase
-# from rest_framework import serializers
-
-
-# class EmptySerializerTestCase(TestCase):
-#     def test_empty_serializer(self):
-#         class FooBarSerializer(serializers.Serializer):
-#             foo = serializers.IntegerField()
-#             bar = serializers.SerializerMethodField()
-
-#             def get_bar(self, obj):
-#                 return 'bar'
-
-#         serializer = FooBarSerializer()
-#         self.assertEquals(serializer.data, {'foo': 0})