Allow related models to be fully serialized

2 files changed, 14 insertions, 28 deletions

diff --git a/djangorestframework/tests/serializer.py b/djangorestframework/tests/serializer.py
index cf00b104..783e941e 100644
--- a/djangorestframework/tests/serializer.py
+++ b/djangorestframework/tests/serializer.py
@@ -69,12 +69,10 @@ class TestFieldNesting(TestCase):
         Test tuple nesting on `fields` attr
         """
         class SerializerM2(Serializer):
-            class Meta:
-                fields = (('field', ('field1',)),)
+            fields = (('field', ('field1',)),)
 
         class SerializerM3(Serializer):
-            class Meta:
-                fields = (('field', ('field2',)),)
+            fields = (('field', ('field2',)),)
 
         self.assertEqual(SerializerM2().serialize(self.m2), {'field': {'field1': u'foo'}})
         self.assertEqual(SerializerM3().serialize(self.m3), {'field': {'field2': u'bar'}})
@@ -85,20 +83,16 @@ class TestFieldNesting(TestCase):
         Test related model serialization
         """
         class NestedM2(Serializer):
-            class Meta:
-                fields = ('field1', )
+            fields = ('field1', )
 
         class NestedM3(Serializer):
-            class Meta:
-                fields = ('field2', )
+            fields = ('field2', )
 
         class SerializerM2(Serializer):
-            class Meta:
-                fields = [('field', NestedM2)]
+            fields = [('field', NestedM2)]
 
         class SerializerM3(Serializer):
-            class Meta:
-                fields = [('field', NestedM3)]
+            fields = [('field', NestedM3)]
 
         self.assertEqual(SerializerM2().serialize(self.m2), {'field': {'field1': u'foo'}})
         self.assertEqual(SerializerM3().serialize(self.m3), {'field': {'field2': u'bar'}})
@@ -108,20 +102,16 @@ class TestFieldNesting(TestCase):
         Test related model serialization
         """
         class SerializerM2(Serializer):
-            class Meta:
-                fields = [('field', 'NestedM2')]
+            fields = [('field', 'NestedM2')]
 
         class SerializerM3(Serializer):
-            class Meta:
-                fields = [('field', 'NestedM3')]
+            fields = [('field', 'NestedM3')]
 
         class NestedM2(Serializer):
-            class Meta:
-                fields = ('field1', )
+            fields = ('field1', )
 
         class NestedM3(Serializer):
-            class Meta:
-                fields = ('field2', )
+            fields = ('field2', )
 
         self.assertEqual(SerializerM2().serialize(self.m2), {'field': {'field1': u'foo'}})
         self.assertEqual(SerializerM3().serialize(self.m3), {'field': {'field2': u'bar'}})
diff --git a/djangorestframework/tests/validators.py b/djangorestframework/tests/validators.py
index 45b75c4f..a1e5d2d7 100644
--- a/djangorestframework/tests/validators.py
+++ b/djangorestframework/tests/validators.py
@@ -75,8 +75,7 @@ class TestNonFieldErrors(TestCase):
                 return self.cleaned_data  #pragma: no cover
         
         class MockResource(FormResource):
-            class Meta:
-                form = MockForm
+            form = MockForm
         
         class MockView(View):
             pass
@@ -100,12 +99,10 @@ class TestFormValidation(TestCase):
             qwerty = forms.CharField(required=True)
 
         class MockFormResource(FormResource):
-            class Meta:
-                form = MockForm
+            form = MockForm
         
         class MockModelResource(ModelResource):
-            class Meta:
-                form = MockForm
+            form = MockForm
  
         class MockFormView(View):
             resource = MockFormResource
@@ -278,8 +275,7 @@ class TestModelFormValidator(TestCase):
                 return 'read only'
         
         class MockResource(ModelResource):
-            class Meta:
-                model = MockModel
+            model = MockModel
  
         class MockView(View):
             resource = MockResource