summaryrefslogtreecommitdiffstats
path: root/Lib/ipaddress.py
diff options
context:
space:
mode:
authorMojoVampire <shadowranger+github@gmail.com>2020-03-03 18:50:17 (GMT)
committerGitHub <noreply@github.com>2020-03-03 18:50:17 (GMT)
commit469325c30e147680543b2f5118b83fd95055a499 (patch)
treec10fd8f26059cb0e6caef9a7c081d324e4146969 /Lib/ipaddress.py
parentae75a294352e9b9487f5dc8e88f068e7e6974dc2 (diff)
downloadcpython-469325c30e147680543b2f5118b83fd95055a499.zip
cpython-469325c30e147680543b2f5118b83fd95055a499.tar.gz
cpython-469325c30e147680543b2f5118b83fd95055a499.tar.bz2
bpo-35712: Make using NotImplemented in a boolean context issue a deprecation warning (GH-13195)
Diffstat (limited to 'Lib/ipaddress.py')
-rw-r--r--Lib/ipaddress.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
index 9c47405..7024339 100644
--- a/Lib/ipaddress.py
+++ b/Lib/ipaddress.py
@@ -1398,7 +1398,7 @@ class IPv4Interface(IPv4Address):
def __eq__(self, other):
address_equal = IPv4Address.__eq__(self, other)
- if not address_equal or address_equal is NotImplemented:
+ if address_equal is NotImplemented or not address_equal:
return address_equal
try:
return self.network == other.network
@@ -2096,7 +2096,7 @@ class IPv6Interface(IPv6Address):
def __eq__(self, other):
address_equal = IPv6Address.__eq__(self, other)
- if not address_equal or address_equal is NotImplemented:
+ if address_equal is NotImplemented or not address_equal:
return address_equal
try:
return self.network == other.network
@@ -2109,7 +2109,7 @@ class IPv6Interface(IPv6Address):
def __lt__(self, other):
address_less = IPv6Address.__lt__(self, other)
if address_less is NotImplemented:
- return NotImplemented
+ return address_less
try:
return (self.network < other.network or
self.network == other.network and address_less)