From bcb693ebd4d3743cb194c6fd05b2d70fb9696a4c Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Sat, 22 Nov 2014 22:29:23 -0700 Subject: Revert "Fixed #23892 -- Made deconstructible classes forwards compatible" This reverts commit f36151ed169813f2873e13ca9de616cfa4095321. Adding kwargs to deconstructed objects does not achieve useful forward-compatibility in general, since additional arguments are silently dropped rather than having their intended effect. In fact, it can make the failure more difficult to diagnose. Thanks Shai Berger for discussion. --- django/core/validators.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'django/core/validators.py') diff --git a/django/core/validators.py b/django/core/validators.py index 846efe7ac8..e0fd995227 100644 --- a/django/core/validators.py +++ b/django/core/validators.py @@ -23,7 +23,7 @@ class RegexValidator(object): inverse_match = False flags = 0 - def __init__(self, regex=None, message=None, code=None, inverse_match=None, flags=None, **kwargs): + def __init__(self, regex=None, message=None, code=None, inverse_match=None, flags=None): if regex is not None: self.regex = regex if message is not None: @@ -134,7 +134,7 @@ class EmailValidator(object): re.IGNORECASE) domain_whitelist = ['localhost'] - def __init__(self, message=None, code=None, whitelist=None, **kwargs): + def __init__(self, message=None, code=None, whitelist=None): if message is not None: self.message = message if code is not None: @@ -251,7 +251,7 @@ class BaseValidator(object): message = _('Ensure this value is %(limit_value)s (it is %(show_value)s).') code = 'limit_value' - def __init__(self, limit_value, message=None, **kwargs): + def __init__(self, limit_value, message=None): self.limit_value = limit_value if message: self.message = message -- cgit v1.3