From af88a5b1751da32018e8408eac01a91a5f63f8ce Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 15 May 2013 14:25:25 +0100
Subject: Test and fix which closes #652.

---
 rest_framework/serializers.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'rest_framework/serializers.py')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index ecff2c52..7707de7a 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -649,8 +649,14 @@ class ModelSerializer(Serializer):
         # Add the `read_only` flag to any fields that have bee specified
         # in the `read_only_fields` option
         for field_name in self.opts.read_only_fields:
+            assert field_name not in self.base_fields.keys(), \
+                "field '%s' on serializer '%s' specfied in " \
+                "`read_only_fields`, but also added " \
+                "as an explict field.  Remove it from `read_only_fields`." % \
+                (field_name, self.__class__.__name__)
             assert field_name in ret, \
-                "read_only_fields on '%s' included invalid item '%s'" % \
+                "Noexistant field '%s' specified in `read_only_fields` " \
+                "on serializer '%s'." % \
                 (self.__class__.__name__, field_name)
             ret[field_name].read_only = True
 
-- 
cgit v1.2.3