[Python-checkins] python/dist/src/Lib/test test_isinstance.py,1.5,1.6

2002年12月12日 11:14:39 -0800

Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv29570/Lib/test
Modified Files:
	test_isinstance.py 
Log Message:
Change issubclass() so that recursive tuples (directly or indirectly
containing class objects) are allowed as the second argument.
This makes issubclass() more similar to isinstance() where recursive
tuples are allowed too.
Index: test_isinstance.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_isinstance.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_isinstance.py	12 Dec 2002 16:41:39 -0000	1.5
--- test_isinstance.py	12 Dec 2002 19:14:07 -0000	1.6
***************
*** 166,169 ****
--- 166,176 ----
 pass
 
+ # new-style classes
+ class NewSuper(object):
+ pass
+ 
+ class NewChild(NewSuper):
+ pass
+ 
 
 
***************
*** 226,230 ****
 self.assertEqual(True, issubclass(Super, (Child, Super)))
 self.assertEqual(False, issubclass(Child, ()))
! self.assertRaises(TypeError, issubclass, Child, ((Child,),))
 
 
--- 233,247 ----
 self.assertEqual(True, issubclass(Super, (Child, Super)))
 self.assertEqual(False, issubclass(Child, ()))
! self.assertEqual(True, issubclass(Super, (Child, (Super,))))
! 
! self.assertEqual(True, issubclass(NewChild, (NewChild,)))
! self.assertEqual(True, issubclass(NewChild, (NewSuper,)))
! self.assertEqual(False, issubclass(NewSuper, (NewChild,)))
! self.assertEqual(True, issubclass(NewSuper, (NewChild, NewSuper)))
! self.assertEqual(False, issubclass(NewChild, ()))
! self.assertEqual(True, issubclass(NewSuper, (NewChild, (NewSuper,))))
! 
! self.assertEqual(True, issubclass(int, (long, (float, int))))
! self.assertEqual(True, issubclass(str, (unicode, (Child, NewChild, basestring))))