Skip to content

Update to the latest version from CPython 3.8 #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
frenzymadness wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Update to the latest version from CPython 3.8 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ded9141
bpo-27683: Fix a regression for host() of ipaddress network objects (…
frenzymadness Nov 20, 2020
d618b56
bpo-36384: Remove check for leading zeroes in IPv4 addresses (GH-12577)
frenzymadness Nov 20, 2020
a312024
In IPv[46]Network, `self.network.prefixlen` is same to `self._prefixl…
frenzymadness Nov 20, 2020
cbfed8e
bpo-27860: ipaddress: fix Interface missed some attributes (GH-12836)
frenzymadness Nov 20, 2020
15d1c3e
bpo-25430: improve performance of IPNetwork.__contains__ (GH-1785)
frenzymadness Nov 20, 2020
c97c325
bpo-36845: validate integer network prefix when constructing IP netwo…
frenzymadness Nov 20, 2020
cfa3166
Resolve hash collisions for IPv4Interface and IPv6Interface
frenzymadness Aug 3, 2020
0a0b444
bpo-41482: Fix error in ipaddress.IPv4Network docstring (GH-21736)
frenzymadness Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
192 changes: 59 additions & 133 deletions ipaddress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,28 @@ def _prefix_from_ip_string(cls, ip_str):
except ValueError:
cls._report_invalid_netmask(ip_str)

@classmethod
def _split_addr_prefix(cls, address):
"""Helper function to parse address of Network/Interface.
Arg:
address: Argument of Network/Interface.
Returns:
(addr, prefix) tuple.
"""
# a packed address or integer
if isinstance(address, (bytes, _compat_int_types)):
return address, cls._max_prefixlen

if not isinstance(address, tuple):
# Assume input argument to be string or any object representation
# which converts into a formatted IP prefix string.
address = _split_optional_netmask(address)

# Constructing from a tuple (addr, [mask])
if len(address) > 1:
return address
return address[0], cls._max_prefixlen

def __reduce__(self):
return self.__class__, (_compat_str(self),)

Expand Down Expand Up @@ -804,8 +826,7 @@ def __contains__(self, other):
# dealing with another address
else:
# address
return (int(self.network_address) <= int(other._ip) <=
int(self.broadcast_address))
return other._ip & self.netmask._ip == self.network_address._ip

def overlaps(self, other):
"""Tell if self is partly contained in other."""
Expand Down Expand Up @@ -1228,6 +1249,8 @@ def _make_netmask(cls, arg):
if arg not in cls._netmask_cache:
if isinstance(arg, _compat_int_types):
prefixlen = arg
if not (0 <= prefixlen <= cls._max_prefixlen):
cls._report_invalid_netmask(prefixlen)
else:
try:
# Check for a netmask in prefix length form
Expand Down Expand Up @@ -1294,12 +1317,6 @@ def _parse_octet(cls, octet_str):
raise ValueError(msg % octet_str)
# Convert to integer (we know digits are legal)
octet_int = int(octet_str, 10)
# Any octets that look like they *might* be written in octal,
# and which don't look exactly the same in both octal and
# decimal are rejected as ambiguous
if octet_int > 7 and octet_str[0] == '0':
msg = "Ambiguous (octal/decimal) value in %r not permitted"
raise ValueError(msg % octet_str)
if octet_int > 255:
raise ValueError("Octet %d (> 255) not permitted" % octet_int)
return octet_int
Expand Down Expand Up @@ -1480,36 +1497,18 @@ def is_link_local(self):
class IPv4Interface(IPv4Address):

def __init__(self, address):
if isinstance(address, (bytes, _compat_int_types)):
IPv4Address.__init__(self, address)
self.network = IPv4Network(self._ip)
self._prefixlen = self._max_prefixlen
return

if isinstance(address, tuple):
IPv4Address.__init__(self, address[0])
if len(address) > 1:
self._prefixlen = int(address[1])
else:
self._prefixlen = self._max_prefixlen

self.network = IPv4Network(address, strict=False)
self.netmask = self.network.netmask
self.hostmask = self.network.hostmask
return
addr, mask = self._split_addr_prefix(address)

addr = _split_optional_netmask(address)
IPv4Address.__init__(self, addr[0])

self.network = IPv4Network(address, strict=False)
IPv4Address.__init__(self, addr)
self.network = IPv4Network((addr, mask), strict=False)
self.netmask = self.network.netmask
self._prefixlen = self.network._prefixlen

self.netmask = self.network.netmask
self.hostmask = self.network.hostmask

def __str__(self):
return '%s/%d' % (self._string_from_ip_int(self._ip),
self.network.prefixlen)
self._prefixlen)

def __eq__(self, other):
address_equal = IPv4Address.__eq__(self, other)
Expand All @@ -1536,7 +1535,8 @@ def __lt__(self, other):
return False

def __hash__(self):
return self._ip ^ self._prefixlen ^ int(self.network.network_address)
return hash((self._ip, self._prefixlen,
int(self.network.network_address)))

__reduce__ = _IPAddressBase.__reduce__

Expand Down Expand Up @@ -1583,7 +1583,7 @@ def __init__(self, address, strict=True):
address: A string or integer representing the IP [& network].
'192.0.2.0/24'
'192.0.2.0/255.255.255.0'
'192.0.0.2/0.0.0.255'
'192.0.2.0/0.0.0.255'
are all functionally the same in IPv4. Similarly,
'192.0.2.1'
'192.0.2.1/255.255.255.255'
Expand Down Expand Up @@ -1614,48 +1614,17 @@ def __init__(self, address, strict=True):
"""
_BaseNetwork.__init__(self, address)

# Constructing from a packed address or integer
if isinstance(address, (_compat_int_types, bytes)):
self.network_address = IPv4Address(address)
self.netmask, self._prefixlen = self._make_netmask(
self._max_prefixlen)
# fixme: address/network test here.
return

if isinstance(address, tuple):
if len(address) > 1:
arg = address[1]
else:
# We weren't given an address[1]
arg = self._max_prefixlen
self.network_address = IPv4Address(address[0])
self.netmask, self._prefixlen = self._make_netmask(arg)
packed = int(self.network_address)
if packed & int(self.netmask) != packed:
if strict:
raise ValueError('%s has host bits set' % self)
else:
self.network_address = IPv4Address(packed &
int(self.netmask))
return

# Assume input argument to be string or any object representation
# which converts into a formatted IP prefix string.
addr = _split_optional_netmask(address)
self.network_address = IPv4Address(self._ip_int_from_string(addr[0]))

if len(addr) == 2:
arg = addr[1]
else:
arg = self._max_prefixlen
self.netmask, self._prefixlen = self._make_netmask(arg)
addr, mask = self._split_addr_prefix(address)

if strict:
if (IPv4Address(int(self.network_address) & int(self.netmask)) !=
self.network_address):
self.network_address = IPv4Address(addr)
self.netmask, self._prefixlen = self._make_netmask(mask)
packed = int(self.network_address)
if packed & int(self.netmask) != packed:
if strict:
raise ValueError('%s has host bits set' % self)
self.network_address = IPv4Address(int(self.network_address) &
int(self.netmask))
else:
self.network_address = IPv4Address(packed &
int(self.netmask))

if self._prefixlen == (self._max_prefixlen - 1):
self.hosts = self.__iter__
Expand Down Expand Up @@ -1741,6 +1710,8 @@ def _make_netmask(cls, arg):
if arg not in cls._netmask_cache:
if isinstance(arg, _compat_int_types):
prefixlen = arg
if not (0 <= prefixlen <= cls._max_prefixlen):
cls._report_invalid_netmask(prefixlen)
else:
prefixlen = cls._prefix_from_prefix_string(arg)
netmask = IPv6Address(cls._ip_int_from_prefix(prefixlen))
Expand Down Expand Up @@ -2177,32 +2148,16 @@ def sixtofour(self):
class IPv6Interface(IPv6Address):

def __init__(self, address):
if isinstance(address, (bytes, _compat_int_types)):
IPv6Address.__init__(self, address)
self.network = IPv6Network(self._ip)
self._prefixlen = self._max_prefixlen
return
if isinstance(address, tuple):
IPv6Address.__init__(self, address[0])
if len(address) > 1:
self._prefixlen = int(address[1])
else:
self._prefixlen = self._max_prefixlen
self.network = IPv6Network(address, strict=False)
self.netmask = self.network.netmask
self.hostmask = self.network.hostmask
return

addr = _split_optional_netmask(address)
IPv6Address.__init__(self, addr[0])
self.network = IPv6Network(address, strict=False)
addr, mask = self._split_addr_prefix(address)
IPv6Address.__init__(self, addr)
self.network = IPv6Network((addr, mask), strict=False)
self.netmask = self.network.netmask
self._prefixlen = self.network._prefixlen
self.hostmask = self.network.hostmask

def __str__(self):
return '%s/%d' % (self._string_from_ip_int(self._ip),
self.network.prefixlen)
self._prefixlen)

def __eq__(self, other):
address_equal = IPv6Address.__eq__(self, other)
Expand All @@ -2229,7 +2184,8 @@ def __lt__(self, other):
return False

def __hash__(self):
return self._ip ^ self._prefixlen ^ int(self.network.network_address)
return hash((self._ip, self._prefixlen,
int(self.network.network_address)))

__reduce__ = _IPAddressBase.__reduce__

Expand Down Expand Up @@ -2311,47 +2267,17 @@ def __init__(self, address, strict=True):
"""
_BaseNetwork.__init__(self, address)

# Efficient constructor from integer or packed address
if isinstance(address, (bytes, _compat_int_types)):
self.network_address = IPv6Address(address)
self.netmask, self._prefixlen = self._make_netmask(
self._max_prefixlen)
return

if isinstance(address, tuple):
if len(address) > 1:
arg = address[1]
else:
arg = self._max_prefixlen
self.netmask, self._prefixlen = self._make_netmask(arg)
self.network_address = IPv6Address(address[0])
packed = int(self.network_address)
if packed & int(self.netmask) != packed:
if strict:
raise ValueError('%s has host bits set' % self)
else:
self.network_address = IPv6Address(packed &
int(self.netmask))
return
addr, mask = self._split_addr_prefix(address)

# Assume input argument to be string or any object representation
# which converts into a formatted IP prefix string.
addr = _split_optional_netmask(address)

self.network_address = IPv6Address(self._ip_int_from_string(addr[0]))

if len(addr) == 2:
arg = addr[1]
else:
arg = self._max_prefixlen
self.netmask, self._prefixlen = self._make_netmask(arg)

if strict:
if (IPv6Address(int(self.network_address) & int(self.netmask)) !=
self.network_address):
self.network_address = IPv6Address(addr)
self.netmask, self._prefixlen = self._make_netmask(mask)
packed = int(self.network_address)
if packed & int(self.netmask) != packed:
if strict:
raise ValueError('%s has host bits set' % self)
self.network_address = IPv6Address(int(self.network_address) &
int(self.netmask))
else:
self.network_address = IPv6Address(packed &
int(self.netmask))

if self._prefixlen == (self._max_prefixlen - 1):
self.hosts = self.__iter__
Expand Down
Loading