diff options
| author | Tom Christie | 2014-03-20 16:08:10 +0000 | 
|---|---|---|
| committer | Tom Christie | 2014-03-20 16:08:10 +0000 | 
| commit | 58cae22970361539cffb3a36194ed8b8819b082b (patch) | |
| tree | e57dc0ebc94b88f95093e6ca2fe1bcf117732470 | |
| parent | abe14c06f78de3b1ab20ed73f0ee5691f5224f94 (diff) | |
| parent | 499d3cb8f0cb2f8327050e4fe775ee4bdf288285 (diff) | |
| download | django-rest-framework-58cae22970361539cffb3a36194ed8b8819b082b.tar.bz2 | |
Merge pull request #1474 from elmehdikarami/master
Update serializers.py
| -rw-r--r-- | rest_framework/serializers.py | 8 | 
1 files changed, 7 insertions, 1 deletions
| diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 5c726dfc..88972e25 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -757,6 +757,9 @@ class ModelSerializer(Serializer):                      field.read_only = True                  ret[accessor_name] = field +         +        # Ensure that 'read_only_fields' is an iterable +        assert isinstance(self.opts.read_only_fields, (list, tuple)), '`read_only_fields` must be a list or tuple'           # Add the `read_only` flag to any fields that have been specified          # in the `read_only_fields` option @@ -771,7 +774,10 @@ class ModelSerializer(Serializer):                  "on serializer '%s'." %                  (field_name, self.__class__.__name__))              ret[field_name].read_only = True - +         +        # Ensure that 'write_only_fields' is an iterable +        assert isinstance(self.opts.write_only_fields, (list, tuple)), '`write_only_fields` must be a list or tuple'  +                  for field_name in self.opts.write_only_fields:              assert field_name not in self.base_fields.keys(), (                  "field '%s' on serializer '%s' specified in " | 
