Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Another comparison patch-up: comparing a type with a dynamic metatype 

to one with a static metatype raised an obscure error.
This commit is contained in:
Guido van Rossum 2001-09-24 18:47:40 +00:00
parent 2d879017b3
commit 3d45d8f12e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/test_descr.py
View File

@ -921,6 +921,13 @@ def dynamics():
verify(L(3)*2 == 6) verify(L(3)*2 == 6)
verify(L(3)*L(2) == 6) verify(L(3)*L(2) == 6)
# Test comparison of classes with dynamic metaclasses
class dynamicmetaclass(type):
__dynamic__ = 1
class someclass:
__metaclass__ = dynamicmetaclass
verify(someclass != object)
def errors(): def errors():
if verbose: print "Testing errors..." if verbose: print "Testing errors..."

3
Objects/typeobject.c
View File

@ -2033,7 +2033,8 @@ wrap_cmpfunc(PyObject *self, PyObject *args, void *wrapped)
if (!PyArg_ParseTuple(args, "O", &other)) if (!PyArg_ParseTuple(args, "O", &other))
return NULL; return NULL;
if (!PyType_IsSubtype(other->ob_type, self->ob_type)) { if (other->ob_type->tp_compare != func &&
!PyType_IsSubtype(other->ob_type, self->ob_type)) {
PyErr_Format( PyErr_Format(
PyExc_TypeError, PyExc_TypeError,
"%s.__cmp__(x,y) requires y to be a '%s', not a '%s'", "%s.__cmp__(x,y) requires y to be a '%s', not a '%s'",