Less brittle through relationship testing. Closes #1292.

a439c80c · Tom Christie · bc0e9947 · a439c80c
Commit a439c80c authored Dec 21, 2013 by Tom Christie
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

rest_framework/serializers.py
+3 -1

No files found.
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -713,7 +713,9 @@ class ModelSerializer(Serializer):
            is_m2m = isinstance(relation.field,
                                models.fields.related.ManyToManyField)

-            if is_m2m and not relation.field.rel.through._meta.auto_created:
+            if (is_m2m and
+                hasattr(relation.field.rel, 'through') and
+                not relation.field.rel.through._meta.auto_created):
                has_through_model = True

            if nested: