Merge pull request #492 from annacoder/master

Making sure the assert does not fail  when required=False, read_only=True

1 files changed, 1 insertions, 1 deletions

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 285ec9be..82745973 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -133,7 +133,7 @@ class WritableField(Field):
         if required is None:
             self.required = not(read_only)
         else:
-            assert not read_only, "Cannot set required=True and read_only=True"
+            assert not (read_only and required), "Cannot set required=True and read_only=True"
             self.required = required
 
         messages = {}