Merge branch 'version-3.1' of github.com:tomchristie/django-rest-framework into oauth_as_package

Conflicts:
	.travis.yml

1 files changed, 11 insertions, 11 deletions

diff --git a/tests/test_serializer_empty.py b/tests/test_serializer_empty.py
index 30cff361..805ac7d4 100644
--- a/tests/test_serializer_empty.py
+++ b/tests/test_serializer_empty.py
@@ -1,15 +1,15 @@
-from django.test import TestCase
-from rest_framework import serializers
+# 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('get_bar')
+# 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'
+#             def get_bar(self, obj):
+#                 return 'bar'
 
-        serializer = FooBarSerializer()
-        self.assertEquals(serializer.data, {'foo': 0})
+#         serializer = FooBarSerializer()
+#         self.assertEquals(serializer.data, {'foo': 0})