From d368784bacc7e58b426f29937ee842aa14d439ad Mon Sep 17 00:00:00 2001 From: Herbert Parentes Fortes Neto Date: Mon, 12 Feb 2018 10:45:37 -0200 Subject: Fixed #28171 -- Added an exception if Form's empty_permitted and use_required_attribute arguments conflict. --- django/forms/forms.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'django/forms/forms.py') diff --git a/django/forms/forms.py b/django/forms/forms.py index 19d5778468..86f9399001 100644 --- a/django/forms/forms.py +++ b/django/forms/forms.py @@ -99,6 +99,12 @@ class BaseForm: if use_required_attribute is not None: self.use_required_attribute = use_required_attribute + if self.empty_permitted and self.use_required_attribute: + raise ValueError( + 'The empty_permitted and use_required_attribute arguments may ' + 'not both be True.' + ) + # Initialize form renderer. Use a global default if not specified # either as an argument or as self.default_renderer. if renderer is None: -- cgit v1.3