FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Restructure comparison dramatically. There is no longer a default · python/cpython@47b9ff6 · GitHub

  1. python
  2. cpython

Repository navigation

Commit 47b9ff6

Browse files
gvanrossum
committed
Restructure comparison dramatically. There is no longer a default
*ordering* between objects; there is only a default equality test (defined by an object being equal to itself only). Read the comment in object.c. The current implementation never uses a three-way comparison to compute a rich comparison, but it does use a rich comparison to compute a three-way comparison. I'm not quite done ripping out all the calls to PyObject_Compare/Cmp, or replacing tp_compare implementations with tp_richcompare implementations; but much of that has happened (to make most unit tests pass). The following tests still fail, because I need help deciding or understanding: test_codeop -- depends on comparing code objects test_datetime -- need Tim Peters' opinion test_marshal -- depends on comparing code objects test_mutants -- need help understanding it The problem with test_codeop and test_marshal is this: these tests compare two different code objects and expect them to be equal. Is that still a feature we'd like to support? I've temporarily removed the comparison and hash code from code objects, so they use the default (equality by pointer only) comparison. For the other two tests, run them to see for yourself. (There may be more failing test with "-u all".) A general problem with getting lots of these tests to pass is the reality that for object types that have a natural total ordering, implementing __cmp__ is much more convenient than implementing __eq__, __ne__, __lt__, and so on. Should we go back to allowing __cmp__ to provide a total ordering? Should we provide some other way to implement rich comparison with a single method override? Alex proposed a __key__() method; I've considered a __richcmp__() method. Or perhaps __cmp__() just shouldn't be killed off...
1 parent 9a6e62b commit 47b9ff6

57 files changed

Lines changed: 969 additions & 899 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Include/object.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@ PyAPI_FUNC(PyObject *) PyObject_Unicode(PyObject *);
379379
PyAPI_FUNC(int) PyObject_Compare(PyObject *, PyObject *);
380380
PyAPI_FUNC(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int);
381381
PyAPI_FUNC(int) PyObject_RichCompareBool(PyObject *, PyObject *, int);
382+
PyAPI_FUNC(PyObject *) Py_CmpToRich(int op, int cmp);
382383
PyAPI_FUNC(PyObject *) PyObject_GetAttrString(PyObject *, const char *);
383384
PyAPI_FUNC(int) PyObject_SetAttrString(PyObject *, const char *, PyObject *);
384385
PyAPI_FUNC(int) PyObject_HasAttrString(PyObject *, const char *);

‎Lib/StringIO.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def tell(self):
116116
_complain_ifclosed(self.closed)
117117
return self.pos
118118

119-
def read(self, n = -1):
119+
def read(self, n=None):
120120
"""Read at most size bytes from the file
121121
(less if the read hits EOF before obtaining size bytes).
122122
@@ -128,6 +128,8 @@ def read(self, n = -1):
128128
if self.buflist:
129129
self.buf += ''.join(self.buflist)
130130
self.buflist = []
131+
if n is None:
132+
n = -1
131133
if n < 0:
132134
newpos = self.len
133135
else:

‎Lib/UserDict.py‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,16 @@ def __init__(self, dict=None, **kwargs):
88
if len(kwargs):
99
self.update(kwargs)
1010
def __repr__(self): return repr(self.data)
11-
def __cmp__(self, dict):
11+
def __eq__(self, dict):
1212
if isinstance(dict, UserDict):
13-
return cmp(self.data, dict.data)
13+
return self.data == dict.data
1414
else:
15-
return cmp(self.data, dict)
15+
return self.data == dict
16+
def __ne__(self, dict):
17+
if isinstance(dict, UserDict):
18+
return self.data != dict.data
19+
else:
20+
return self.data != dict
1621
def __len__(self): return len(self.data)
1722
def __getitem__(self, key):
1823
if key in self.data:
@@ -162,11 +167,13 @@ def get(self, key, default=None):
162167
return default
163168
def __repr__(self):
164169
return repr(dict(self.iteritems()))
165-
def __cmp__(self, other):
166-
if other is None:
167-
return 1
170+
def __eq__(self, other):
171+
if isinstance(other, DictMixin):
172+
other = dict(other.iteritems())
173+
return dict(self.iteritems()) == other
174+
def __ne__(self, other):
168175
if isinstance(other, DictMixin):
169176
other = dict(other.iteritems())
170-
return cmp(dict(self.iteritems()), other)
177+
return dict(self.iteritems()) != other
171178
def __len__(self):
172179
return len(self.keys())

‎Lib/UserString.py‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,37 @@ def __float__(self): return float(self.data)
2525
def __complex__(self): return complex(self.data)
2626
def __hash__(self): return hash(self.data)
2727

28-
def __cmp__(self, string):
28+
def __eq__(self, string):
2929
if isinstance(string, UserString):
30-
return cmp(self.data, string.data)
30+
return self.data == string.data
3131
else:
32-
return cmp(self.data, string)
32+
return self.data == string
33+
def __ne__(self, string):
34+
if isinstance(string, UserString):
35+
return self.data != string.data
36+
else:
37+
return self.data != string
38+
def __lt__(self, string):
39+
if isinstance(string, UserString):
40+
return self.data < string.data
41+
else:
42+
return self.data < string
43+
def __le__(self, string):
44+
if isinstance(string, UserString):
45+
return self.data <= string.data
46+
else:
47+
return self.data <= string
48+
def __gt__(self, string):
49+
if isinstance(string, UserString):
50+
return self.data > string.data
51+
else:
52+
return self.data > string
53+
def __ge__(self, string):
54+
if isinstance(string, UserString):
55+
return self.data >= string.data
56+
else:
57+
return self.data >= string
58+
3359
def __contains__(self, char):
3460
return char in self.data
3561

‎Lib/ctypes/test/test_simplesubclasses.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
from ctypes import *
33

44
class MyInt(c_int):
5-
def __cmp__(self, other):
5+
def __eq__(self, other):
66
if type(other) != MyInt:
7-
return -1
8-
return cmp(self.value, other.value)
7+
return NotImplementedError
8+
return self.value == other.value
99

1010
class Test(unittest.TestCase):
1111

‎Lib/decimal.py‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,26 @@ def __ne__(self, other):
706706
return NotImplemented
707707
return self.__cmp__(other) != 0
708708

709+
def __lt__(self, other):
710+
if not isinstance(other, (Decimal, int, long)):
711+
return NotImplemented
712+
return self.__cmp__(other) < 0
713+
714+
def __le__(self, other):
715+
if not isinstance(other, (Decimal, int, long)):
716+
return NotImplemented
717+
return self.__cmp__(other) <= 0
718+
719+
def __gt__(self, other):
720+
if not isinstance(other, (Decimal, int, long)):
721+
return NotImplemented
722+
return self.__cmp__(other) > 0
723+
724+
def __ge__(self, other):
725+
if not isinstance(other, (Decimal, int, long)):
726+
return NotImplemented
727+
return self.__cmp__(other) >= 0
728+
709729
def compare(self, other, context=None):
710730
"""Compares one to another.
711731
@@ -1894,6 +1914,7 @@ def to_integral(self, rounding=None, context=None):
18941914
ans = self._check_nans(context=context)
18951915
if ans:
18961916
return ans
1917+
return self
18971918
if self._exp >= 0:
18981919
return self
18991920
if context is None:

‎Lib/distutils/version.py‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
class Version:
3333
"""Abstract base class for version numbering classes. Just provides
3434
constructor (__init__) and reproducer (__repr__), because those
35-
seem to be the same for all version numbering classes.
35+
seem to be the same for all version numbering classes; and route
36+
rich comparisons to __cmp__.
3637
"""
3738

3839
def __init__ (self, vstring=None):
@@ -42,6 +43,42 @@ def __init__ (self, vstring=None):
4243
def __repr__ (self):
4344
return "%s ('%s')" % (self.__class__.__name__, str(self))
4445

46+
def __eq__(self, other):
47+
c = self.__cmp__(other)
48+
if c is NotImplemented:
49+
return c
50+
return c == 0
51+
52+
def __ne__(self, other):
53+
c = self.__cmp__(other)
54+
if c is NotImplemented:
55+
return c
56+
return c != 0
57+
58+
def __lt__(self, other):
59+
c = self.__cmp__(other)
60+
if c is NotImplemented:
61+
return c
62+
return c < 0
63+
64+
def __le__(self, other):
65+
c = self.__cmp__(other)
66+
if c is NotImplemented:
67+
return c
68+
return c <= 0
69+
70+
def __gt__(self, other):
71+
c = self.__cmp__(other)
72+
if c is NotImplemented:
73+
return c
74+
return c > 0
75+
76+
def __ge__(self, other):
77+
c = self.__cmp__(other)
78+
if c is NotImplemented:
79+
return c
80+
return c >= 0
81+
4582

4683
# Interface for version-number classes -- must be implemented
4784
# by the following classes (the concrete ones -- Version should

‎Lib/doctest.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -469,11 +469,12 @@ def __repr__(self):
469469

470470

471471
# This lets us sort tests by name:
472-
def __cmp__(self, other):
472+
def __lt__(self, other):
473473
if not isinstance(other, DocTest):
474-
return -1
475-
return cmp((self.name, self.filename, self.lineno, id(self)),
476-
(other.name, other.filename, other.lineno, id(other)))
474+
return NotImplemented
475+
return ((self.name, self.filename, self.lineno, id(self))
476+
<
477+
(other.name, other.filename, other.lineno, id(other)))
477478

478479
######################################################################
479480
## 3. DocTestParser

‎Lib/optparse.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -838,13 +838,13 @@ def __str__(self):
838838

839839
__repr__ = _repr
840840

841-
def __cmp__(self, other):
841+
def __eq__(self, other):
842842
if isinstance(other, Values):
843-
return cmp(self.__dict__, other.__dict__)
843+
return self.__dict__ == other.__dict__
844844
elif isinstance(other, types.DictType):
845-
return cmp(self.__dict__, other)
845+
return self.__dict__ == other
846846
else:
847-
return -1
847+
return NotImplemented
848848

849849
def _update_careful(self, dict):
850850
"""

‎Lib/plat-mac/plistlib.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,13 +374,13 @@ def fromBase64(cls, data):
374374
def asBase64(self, maxlinelength=76):
375375
return _encodeBase64(self.data, maxlinelength)
376376

377-
def __cmp__(self, other):
377+
def __eq__(self, other):
378378
if isinstance(other, self.__class__):
379-
return cmp(self.data, other.data)
379+
return self.data == other.data
380380
elif isinstance(other, str):
381-
return cmp(self.data, other)
381+
return self.data == other
382382
else:
383-
return cmp(id(self), id(other))
383+
return id(self) == id(other)
384384

385385
def __repr__(self):
386386
return "%s(%s)" % (self.__class__.__name__, repr(self.data))

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL