mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-29 19:56:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

[3.6] bpo-29931 fix __lt__ check in ipaddress.ip_interface for both v4 and v6. (GH-879) (#2217)

Browse source 
the original logic was just comparing the network address
but this is wrong because if the network address is equal then
we need to compare the ip address for breaking the tie

add more ip_interface comparison tests.
(cherry picked from commit 7bd8d3e794)
This commit is contained in:
Serhiy Storchaka 2017-06-15 17:16:38 +03:00 • committed by GitHub
parent f75f6edb1f
commit cf58dfb44c
3 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/ipaddress.py
View file

@ -1410,7 +1410,8 @@ class IPv4Interface(IPv4Address):
if address_less is NotImplemented: if address_less is NotImplemented:
return NotImplemented return NotImplemented
try: try:
return self.network < other.network return (self.network < other.network or
self.network == other.network and address_less)
except AttributeError: except AttributeError:
# We *do* allow addresses and interfaces to be sorted. The # We *do* allow addresses and interfaces to be sorted. The
# unassociated address is considered less than all interfaces. # unassociated address is considered less than all interfaces.
@ -2100,7 +2101,8 @@ class IPv6Interface(IPv6Address):
if address_less is NotImplemented: if address_less is NotImplemented:
return NotImplemented return NotImplemented
try: try:
return self.network < other.network return (self.network < other.network or
self.network == other.network and address_less)
except AttributeError: except AttributeError:
# We *do* allow addresses and interfaces to be sorted. The # We *do* allow addresses and interfaces to be sorted. The
# unassociated address is considered less than all interfaces. # unassociated address is considered less than all interfaces.

37
Lib/test/test_ipaddress.py
View file

@ -1405,14 +1405,35 @@ class IpaddrUnitTest(unittest.TestCase):
ipaddress.ip_address('::2')) ipaddress.ip_address('::2'))
def testInterfaceComparison(self): def testInterfaceComparison(self):
self.assertTrue(ipaddress.ip_interface('1.1.1.1') <= self.assertTrue(ipaddress.ip_interface('1.1.1.1/24') ==
ipaddress.ip_interface('1.1.1.1')) ipaddress.ip_interface('1.1.1.1/24'))
self.assertTrue(ipaddress.ip_interface('1.1.1.1') <= self.assertTrue(ipaddress.ip_interface('1.1.1.1/16') <
ipaddress.ip_interface('1.1.1.2')) ipaddress.ip_interface('1.1.1.1/24'))
self.assertTrue(ipaddress.ip_interface('::1') <= self.assertTrue(ipaddress.ip_interface('1.1.1.1/24') <
ipaddress.ip_interface('::1')) ipaddress.ip_interface('1.1.1.2/24'))
self.assertTrue(ipaddress.ip_interface('::1') <= self.assertTrue(ipaddress.ip_interface('1.1.1.2/16') <
ipaddress.ip_interface('::2')) ipaddress.ip_interface('1.1.1.1/24'))
self.assertTrue(ipaddress.ip_interface('1.1.1.1/24') >
ipaddress.ip_interface('1.1.1.1/16'))
self.assertTrue(ipaddress.ip_interface('1.1.1.2/24') >
ipaddress.ip_interface('1.1.1.1/24'))
self.assertTrue(ipaddress.ip_interface('1.1.1.1/24') >
ipaddress.ip_interface('1.1.1.2/16'))
self.assertTrue(ipaddress.ip_interface('::1/64') ==
ipaddress.ip_interface('::1/64'))
self.assertTrue(ipaddress.ip_interface('::1/64') <
ipaddress.ip_interface('::1/80'))
self.assertTrue(ipaddress.ip_interface('::1/64') <
ipaddress.ip_interface('::2/64'))
self.assertTrue(ipaddress.ip_interface('::2/48') <
ipaddress.ip_interface('::1/64'))
self.assertTrue(ipaddress.ip_interface('::1/80') >
ipaddress.ip_interface('::1/64'))
self.assertTrue(ipaddress.ip_interface('::2/64') >
ipaddress.ip_interface('::1/64'))
self.assertTrue(ipaddress.ip_interface('::1/64') >
ipaddress.ip_interface('::2/48'))
def testNetworkComparison(self): def testNetworkComparison(self):
# ip1 and ip2 have the same network address # ip1 and ip2 have the same network address

3
Misc/NEWS
View file

@ -51,6 +51,9 @@ Core and Builtins
Library Library
------- -------
- bpo-29931: Fixed comparison check for ipaddress.ip_interface objects.
Patch by Sanjay Sundaresan.
- bpo-30605: re.compile() no longer raises a BytesWarning when compiling a - bpo-30605: re.compile() no longer raises a BytesWarning when compiling a
bytes instance with misplaced inline modifier. Patch by Roy Williams. bytes instance with misplaced inline modifier. Patch by Roy Williams.