Commit d6effbf7 by Andrea Grandi

Remove unpack_ipv4 parameter

parent 466575be
...@@ -661,17 +661,18 @@ class IPAddressField(CharField): ...@@ -661,17 +661,18 @@ class IPAddressField(CharField):
'invalid': _('Enter a valid IPv4 or IPv6 address.'), 'invalid': _('Enter a valid IPv4 or IPv6 address.'),
} }
def __init__(self, protocol='both', unpack_ipv4=False, **kwargs): def __init__(self, protocol='both', **kwargs):
self.protocol = protocol.lower() self.protocol = protocol.lower()
self.unpack_ipv4 = unpack_ipv4 self.unpack_ipv4 = (self.protocol == 'both')
super(IPAddressField, self).__init__(**kwargs) super(IPAddressField, self).__init__(**kwargs)
validators, error_message = ip_address_validators(protocol, unpack_ipv4) validators, error_message = ip_address_validators(protocol, self.unpack_ipv4)
self.validators.extend(validators) self.validators.extend(validators)
def to_internal_value(self, data): def to_internal_value(self, data):
if data and ':' in data: if data and ':' in data:
try: try:
return clean_ipv6_address(data, self.unpack_ipv4) if self.protocol in ('both', 'ipv6'):
return clean_ipv6_address(data, self.unpack_ipv4)
except DjangoValidationError: except DjangoValidationError:
self.fail('invalid', value=data) self.fail('invalid', value=data)
......
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