Merge pull request #10262 from jdufresne/nonzero

Remove Python 2 __nonzero__ method definitions

Author: uranusjr

news/51d70b65-78e9-426c-80a6-47efcaad9628.trivial.rst

@@ -189,13 +189,9 @@ def __str__(self):
             return '\n'.join(lines)
         return ''
 
-    def __nonzero__(self):
-        # type: () -> bool
-        return bool(self.errors)
-
     def __bool__(self):
         # type: () -> bool
-        return self.__nonzero__()
+        return bool(self.errors)
 
 
 class HashError(InstallationError):

src/pip/_internal/exceptions.py

@@ -36,11 +36,8 @@ def from_ireq(cls, ireq: InstallRequirement) -> "Constraint":
         links = frozenset([ireq.link]) if ireq.link else frozenset()
         return Constraint(ireq.specifier, ireq.hashes(trust_internet=False), links)
 
-    def __nonzero__(self) -> bool:
-        return bool(self.specifier) or bool(self.hashes) or bool(self.links)
-
     def __bool__(self) -> bool:
-        return self.__nonzero__()
+        return bool(self.specifier) or bool(self.hashes) or bool(self.links)
 
     def __and__(self, other: InstallRequirement) -> "Constraint":
         if not isinstance(other, InstallRequirement):

src/pip/_internal/resolution/resolvelib/base.py

@@ -138,5 +138,3 @@ def __bool__(self) -> bool:
         if self._prefers_installed and self._installed:
             return True
         return any(self)
-
-    __nonzero__ = __bool__  # XXX: Python 2.

src/pip/_internal/resolution/resolvelib/found_candidates.py

@@ -117,15 +117,11 @@ def check_against_path(self, path):
         with open(path, "rb") as file:
             return self.check_against_file(file)
 
-    def __nonzero__(self):
+    def __bool__(self):
         # type: () -> bool
         """Return whether I know any known-good hashes."""
         return bool(self._allowed)
 
-    def __bool__(self):
-        # type: () -> bool
-        return self.__nonzero__()
-
     def __eq__(self, other):
         # type: (object) -> bool
         if not isinstance(other, Hashes):