Commit afd2a8f8 by Tom Christie

Adjust ModelField.null mappings now that Django-25320 is resolved

parent f87573ff
...@@ -233,14 +233,9 @@ def get_relation_kwargs(field_name, relation_info): ...@@ -233,14 +233,9 @@ def get_relation_kwargs(field_name, relation_info):
# No further keyword arguments are valid. # No further keyword arguments are valid.
return kwargs return kwargs
# Currently required for 1.9 master behavior, if model_field.has_default() or model_field.blank or model_field.null:
# may be able to remove this with 1.9 alpha.
# See https://code.djangoproject.com/ticket/25320
null = model_field.null and not to_many
if model_field.has_default() or model_field.blank or null:
kwargs['required'] = False kwargs['required'] = False
if null: if model_field.null:
kwargs['allow_null'] = True kwargs['allow_null'] = True
if model_field.validators: if model_field.validators:
kwargs['validators'] = model_field.validators kwargs['validators'] = model_field.validators
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment