mirror of
https://github.com/python/cpython.git
synced 2025-08-30 21:48:47 +00:00
Issue #23326: Removed __ne__ implementations. Since fixing default __ne__
implementation in issue #21408 they are redundant.
This commit is contained in:
parent
57f7db3122
commit
08448a1f4d
20 changed files with 3 additions and 104 deletions
|
@ -923,15 +923,6 @@ class Decimal(object):
|
||||||
return False
|
return False
|
||||||
return self._cmp(other) == 0
|
return self._cmp(other) == 0
|
||||||
|
|
||||||
def __ne__(self, other, context=None):
|
|
||||||
self, other = _convert_for_comparison(self, other, equality_op=True)
|
|
||||||
if other is NotImplemented:
|
|
||||||
return other
|
|
||||||
if self._check_nans(other, context):
|
|
||||||
return True
|
|
||||||
return self._cmp(other) != 0
|
|
||||||
|
|
||||||
|
|
||||||
def __lt__(self, other, context=None):
|
def __lt__(self, other, context=None):
|
||||||
self, other = _convert_for_comparison(self, other)
|
self, other = _convert_for_comparison(self, other)
|
||||||
if other is NotImplemented:
|
if other is NotImplemented:
|
||||||
|
|
|
@ -1209,11 +1209,6 @@ class Namespace(_AttributeHolder):
|
||||||
return NotImplemented
|
return NotImplemented
|
||||||
return vars(self) == vars(other)
|
return vars(self) == vars(other)
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
if not isinstance(other, Namespace):
|
|
||||||
return NotImplemented
|
|
||||||
return not (self == other)
|
|
||||||
|
|
||||||
def __contains__(self, key):
|
def __contains__(self, key):
|
||||||
return key in self.__dict__
|
return key in self.__dict__
|
||||||
|
|
||||||
|
|
|
@ -178,10 +178,6 @@ class TimerHandle(Handle):
|
||||||
self._cancelled == other._cancelled)
|
self._cancelled == other._cancelled)
|
||||||
return NotImplemented
|
return NotImplemented
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
equal = self.__eq__(other)
|
|
||||||
return NotImplemented if equal is NotImplemented else not equal
|
|
||||||
|
|
||||||
def cancel(self):
|
def cancel(self):
|
||||||
if not self._cancelled:
|
if not self._cancelled:
|
||||||
self._loop._timer_handle_cancelled(self)
|
self._loop._timer_handle_cancelled(self)
|
||||||
|
|
|
@ -987,7 +987,6 @@ class UserList(MutableSequence):
|
||||||
def __lt__(self, other): return self.data < self.__cast(other)
|
def __lt__(self, other): return self.data < self.__cast(other)
|
||||||
def __le__(self, other): return self.data <= self.__cast(other)
|
def __le__(self, other): return self.data <= self.__cast(other)
|
||||||
def __eq__(self, other): return self.data == self.__cast(other)
|
def __eq__(self, other): return self.data == self.__cast(other)
|
||||||
def __ne__(self, other): return self.data != self.__cast(other)
|
|
||||||
def __gt__(self, other): return self.data > self.__cast(other)
|
def __gt__(self, other): return self.data > self.__cast(other)
|
||||||
def __ge__(self, other): return self.data >= self.__cast(other)
|
def __ge__(self, other): return self.data >= self.__cast(other)
|
||||||
def __cast(self, other):
|
def __cast(self, other):
|
||||||
|
@ -1064,10 +1063,6 @@ class UserString(Sequence):
|
||||||
if isinstance(string, UserString):
|
if isinstance(string, UserString):
|
||||||
return self.data == string.data
|
return self.data == string.data
|
||||||
return self.data == string
|
return self.data == string
|
||||||
def __ne__(self, string):
|
|
||||||
if isinstance(string, UserString):
|
|
||||||
return self.data != string.data
|
|
||||||
return self.data != string
|
|
||||||
def __lt__(self, string):
|
def __lt__(self, string):
|
||||||
if isinstance(string, UserString):
|
if isinstance(string, UserString):
|
||||||
return self.data < string.data
|
return self.data < string.data
|
||||||
|
|
|
@ -567,12 +567,6 @@ class timedelta:
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
if isinstance(other, timedelta):
|
|
||||||
return self._cmp(other) != 0
|
|
||||||
else:
|
|
||||||
return True
|
|
||||||
|
|
||||||
def __le__(self, other):
|
def __le__(self, other):
|
||||||
if isinstance(other, timedelta):
|
if isinstance(other, timedelta):
|
||||||
return self._cmp(other) <= 0
|
return self._cmp(other) <= 0
|
||||||
|
@ -804,11 +798,6 @@ class date:
|
||||||
return self._cmp(other) == 0
|
return self._cmp(other) == 0
|
||||||
return NotImplemented
|
return NotImplemented
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
if isinstance(other, date):
|
|
||||||
return self._cmp(other) != 0
|
|
||||||
return NotImplemented
|
|
||||||
|
|
||||||
def __le__(self, other):
|
def __le__(self, other):
|
||||||
if isinstance(other, date):
|
if isinstance(other, date):
|
||||||
return self._cmp(other) <= 0
|
return self._cmp(other) <= 0
|
||||||
|
@ -1079,12 +1068,6 @@ class time:
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
if isinstance(other, time):
|
|
||||||
return self._cmp(other, allow_mixed=True) != 0
|
|
||||||
else:
|
|
||||||
return True
|
|
||||||
|
|
||||||
def __le__(self, other):
|
def __le__(self, other):
|
||||||
if isinstance(other, time):
|
if isinstance(other, time):
|
||||||
return self._cmp(other) <= 0
|
return self._cmp(other) <= 0
|
||||||
|
@ -1651,14 +1634,6 @@ class datetime(date):
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
if isinstance(other, datetime):
|
|
||||||
return self._cmp(other, allow_mixed=True) != 0
|
|
||||||
elif not isinstance(other, date):
|
|
||||||
return NotImplemented
|
|
||||||
else:
|
|
||||||
return True
|
|
||||||
|
|
||||||
def __le__(self, other):
|
def __le__(self, other):
|
||||||
if isinstance(other, datetime):
|
if isinstance(other, datetime):
|
||||||
return self._cmp(other) <= 0
|
return self._cmp(other) <= 0
|
||||||
|
|
|
@ -48,12 +48,6 @@ class Version:
|
||||||
return c
|
return c
|
||||||
return c == 0
|
return c == 0
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
c = self._cmp(other)
|
|
||||||
if c is NotImplemented:
|
|
||||||
return c
|
|
||||||
return c != 0
|
|
||||||
|
|
||||||
def __lt__(self, other):
|
def __lt__(self, other):
|
||||||
c = self._cmp(other)
|
c = self._cmp(other)
|
||||||
if c is NotImplemented:
|
if c is NotImplemented:
|
||||||
|
|
|
@ -249,9 +249,6 @@ class Charset:
|
||||||
def __eq__(self, other):
|
def __eq__(self, other):
|
||||||
return str(self) == str(other).lower()
|
return str(self) == str(other).lower()
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
return not self.__eq__(other)
|
|
||||||
|
|
||||||
def get_body_encoding(self):
|
def get_body_encoding(self):
|
||||||
"""Return the content-transfer-encoding used for body encoding.
|
"""Return the content-transfer-encoding used for body encoding.
|
||||||
|
|
||||||
|
|
|
@ -262,9 +262,6 @@ class Header:
|
||||||
# args and do another comparison.
|
# args and do another comparison.
|
||||||
return other == str(self)
|
return other == str(self)
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
return not self == other
|
|
||||||
|
|
||||||
def append(self, s, charset=None, errors='strict'):
|
def append(self, s, charset=None, errors='strict'):
|
||||||
"""Append a string to the MIME header.
|
"""Append a string to the MIME header.
|
||||||
|
|
||||||
|
|
|
@ -223,8 +223,6 @@ def cmp_to_key(mycmp):
|
||||||
return mycmp(self.obj, other.obj) <= 0
|
return mycmp(self.obj, other.obj) <= 0
|
||||||
def __ge__(self, other):
|
def __ge__(self, other):
|
||||||
return mycmp(self.obj, other.obj) >= 0
|
return mycmp(self.obj, other.obj) >= 0
|
||||||
def __ne__(self, other):
|
|
||||||
return mycmp(self.obj, other.obj) != 0
|
|
||||||
__hash__ = None
|
__hash__ = None
|
||||||
return K
|
return K
|
||||||
|
|
||||||
|
|
|
@ -2255,9 +2255,6 @@ class Parameter:
|
||||||
self._default == other._default and
|
self._default == other._default and
|
||||||
self._annotation == other._annotation)
|
self._annotation == other._annotation)
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
return not self.__eq__(other)
|
|
||||||
|
|
||||||
|
|
||||||
class BoundArguments:
|
class BoundArguments:
|
||||||
"""Result of `Signature.bind` call. Holds the mapping of arguments
|
"""Result of `Signature.bind` call. Holds the mapping of arguments
|
||||||
|
@ -2342,9 +2339,6 @@ class BoundArguments:
|
||||||
self.signature == other.signature and
|
self.signature == other.signature and
|
||||||
self.arguments == other.arguments)
|
self.arguments == other.arguments)
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
return not self.__eq__(other)
|
|
||||||
|
|
||||||
|
|
||||||
class Signature:
|
class Signature:
|
||||||
"""A Signature object represents the overall signature of a function.
|
"""A Signature object represents the overall signature of a function.
|
||||||
|
@ -2559,9 +2553,6 @@ class Signature:
|
||||||
return (isinstance(other, Signature) and
|
return (isinstance(other, Signature) and
|
||||||
self._hash_basis() == other._hash_basis())
|
self._hash_basis() == other._hash_basis())
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
return not self.__eq__(other)
|
|
||||||
|
|
||||||
def _bind(self, args, kwargs, *, partial=False):
|
def _bind(self, args, kwargs, *, partial=False):
|
||||||
"""Private method. Don't use directly."""
|
"""Private method. Don't use directly."""
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,6 @@ __all__ = ["scheduler"]
|
||||||
|
|
||||||
class Event(namedtuple('Event', 'time, priority, action, argument, kwargs')):
|
class Event(namedtuple('Event', 'time, priority, action, argument, kwargs')):
|
||||||
def __eq__(s, o): return (s.time, s.priority) == (o.time, o.priority)
|
def __eq__(s, o): return (s.time, s.priority) == (o.time, o.priority)
|
||||||
def __ne__(s, o): return (s.time, s.priority) != (o.time, o.priority)
|
|
||||||
def __lt__(s, o): return (s.time, s.priority) < (o.time, o.priority)
|
def __lt__(s, o): return (s.time, s.priority) < (o.time, o.priority)
|
||||||
def __le__(s, o): return (s.time, s.priority) <= (o.time, o.priority)
|
def __le__(s, o): return (s.time, s.priority) <= (o.time, o.priority)
|
||||||
def __gt__(s, o): return (s.time, s.priority) > (o.time, o.priority)
|
def __gt__(s, o): return (s.time, s.priority) > (o.time, o.priority)
|
||||||
|
|
|
@ -1305,8 +1305,6 @@ class TestDate(HarmlessMixedComparison, unittest.TestCase):
|
||||||
return isinstance(other, LargerThanAnything)
|
return isinstance(other, LargerThanAnything)
|
||||||
def __eq__(self, other):
|
def __eq__(self, other):
|
||||||
return isinstance(other, LargerThanAnything)
|
return isinstance(other, LargerThanAnything)
|
||||||
def __ne__(self, other):
|
|
||||||
return not isinstance(other, LargerThanAnything)
|
|
||||||
def __gt__(self, other):
|
def __gt__(self, other):
|
||||||
return not isinstance(other, LargerThanAnything)
|
return not isinstance(other, LargerThanAnything)
|
||||||
def __ge__(self, other):
|
def __ge__(self, other):
|
||||||
|
|
|
@ -69,9 +69,6 @@ class NS(object):
|
||||||
def __eq__(self, other):
|
def __eq__(self, other):
|
||||||
return vars(self) == vars(other)
|
return vars(self) == vars(other)
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
return not (self == other)
|
|
||||||
|
|
||||||
|
|
||||||
class ArgumentParserError(Exception):
|
class ArgumentParserError(Exception):
|
||||||
|
|
||||||
|
|
|
@ -599,8 +599,6 @@ class LongTest(unittest.TestCase):
|
||||||
return (x > y) - (x < y)
|
return (x > y) - (x < y)
|
||||||
def __eq__(self, other):
|
def __eq__(self, other):
|
||||||
return self._cmp__(other) == 0
|
return self._cmp__(other) == 0
|
||||||
def __ne__(self, other):
|
|
||||||
return self._cmp__(other) != 0
|
|
||||||
def __ge__(self, other):
|
def __ge__(self, other):
|
||||||
return self._cmp__(other) >= 0
|
return self._cmp__(other) >= 0
|
||||||
def __gt__(self, other):
|
def __gt__(self, other):
|
||||||
|
|
|
@ -2015,10 +2015,6 @@ class _Call(tuple):
|
||||||
return (other_args, other_kwargs) == (self_args, self_kwargs)
|
return (other_args, other_kwargs) == (self_args, self_kwargs)
|
||||||
|
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
return not self.__eq__(other)
|
|
||||||
|
|
||||||
|
|
||||||
def __call__(self, *args, **kwargs):
|
def __call__(self, *args, **kwargs):
|
||||||
if self.name is None:
|
if self.name is None:
|
||||||
return _Call(('', args, kwargs), name='()')
|
return _Call(('', args, kwargs), name='()')
|
||||||
|
|
|
@ -185,11 +185,6 @@ class UUID(object):
|
||||||
return self.int == other.int
|
return self.int == other.int
|
||||||
return NotImplemented
|
return NotImplemented
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
if isinstance(other, UUID):
|
|
||||||
return self.int != other.int
|
|
||||||
return NotImplemented
|
|
||||||
|
|
||||||
# Q. What's the value of being able to sort UUIDs?
|
# Q. What's the value of being able to sort UUIDs?
|
||||||
# A. Use them as keys in a B-Tree or similar mapping.
|
# A. Use them as keys in a B-Tree or similar mapping.
|
||||||
|
|
||||||
|
|
|
@ -545,9 +545,6 @@ class NamedNodeMap(object):
|
||||||
def __lt__(self, other):
|
def __lt__(self, other):
|
||||||
return self._cmp(other) < 0
|
return self._cmp(other) < 0
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
return self._cmp(other) != 0
|
|
||||||
|
|
||||||
def __getitem__(self, attname_or_tuple):
|
def __getitem__(self, attname_or_tuple):
|
||||||
if isinstance(attname_or_tuple, tuple):
|
if isinstance(attname_or_tuple, tuple):
|
||||||
return self._attrsNS[attname_or_tuple]
|
return self._attrsNS[attname_or_tuple]
|
||||||
|
|
|
@ -532,10 +532,6 @@ class QName:
|
||||||
if isinstance(other, QName):
|
if isinstance(other, QName):
|
||||||
return self.text == other.text
|
return self.text == other.text
|
||||||
return self.text == other
|
return self.text == other
|
||||||
def __ne__(self, other):
|
|
||||||
if isinstance(other, QName):
|
|
||||||
return self.text != other.text
|
|
||||||
return self.text != other
|
|
||||||
|
|
||||||
# --------------------------------------------------------------------
|
# --------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -340,10 +340,6 @@ class DateTime:
|
||||||
s, o = self.make_comparable(other)
|
s, o = self.make_comparable(other)
|
||||||
return s == o
|
return s == o
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
s, o = self.make_comparable(other)
|
|
||||||
return s != o
|
|
||||||
|
|
||||||
def timetuple(self):
|
def timetuple(self):
|
||||||
return time.strptime(self.value, "%Y%m%dT%H:%M:%S")
|
return time.strptime(self.value, "%Y%m%dT%H:%M:%S")
|
||||||
|
|
||||||
|
@ -407,11 +403,6 @@ class Binary:
|
||||||
other = other.data
|
other = other.data
|
||||||
return self.data == other
|
return self.data == other
|
||||||
|
|
||||||
def __ne__(self, other):
|
|
||||||
if isinstance(other, Binary):
|
|
||||||
other = other.data
|
|
||||||
return self.data != other
|
|
||||||
|
|
||||||
def decode(self, data):
|
def decode(self, data):
|
||||||
self.data = base64.decodebytes(data)
|
self.data = base64.decodebytes(data)
|
||||||
|
|
||||||
|
|
|
@ -226,6 +226,9 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #23326: Removed __ne__ implementations. Since fixing default __ne__
|
||||||
|
implementation in issue #21408 they are redundant.
|
||||||
|
|
||||||
- Issue #14099: Restored support of writing ZIP files to tellable but
|
- Issue #14099: Restored support of writing ZIP files to tellable but
|
||||||
non-seekable streams.
|
non-seekable streams.
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue