[Python-checkins] python/dist/src/Lib/test test_descr.py,1.113.4.10,1.113.4.11

[gvanrossum@sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv9829

Modified Files:
      Tag: release22-maint
	test_descr.py 
Log Message:
Backport rev 2.132 (note: some earlier bugfix candidates still TBD).

SF bug 542984.

Change type_get_doc (the get function for __doc__) to look in tp_dict
more often, and if it finds a descriptor in tp_dict, to call it (with
a NULL instance).  This means you can add a __doc__ descriptor to a
new-style class that returns instance docs when called on an instance,
and class docs when called on a class -- or the same docs in either
case, but lazily computed.

I'll also check this into the 2.2 maintenance branch.


Index: test_descr.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_descr.py,v
retrieving revision 1.113.4.10
retrieving revision 1.113.4.11
diff -C2 -d -r1.113.4.10 -r1.113.4.11
*** test_descr.py	5 Apr 2002 15:42:50 -0000	1.113.4.10
--- test_descr.py	18 Apr 2002 00:37:10 -0000	1.113.4.11
***************
*** 2844,2847 ****
--- 2844,2866 ----
      vereq(m.__dict__, {"foo": 1})
  
+ def docdescriptor():
+     # SF bug 542984
+     if verbose: print "Testing __doc__ descriptor..."
+     class DocDescr(object):
+         def __get__(self, object, otype):
+             if object:
+                 object = object.__class__.__name__ + ' instance'
+             if otype:
+                 otype = otype.__name__
+             return 'object=%s; type=%s' % (object, otype)
+     class OldClass:
+         __doc__ = DocDescr()
+     class NewClass(object):
+         __doc__ = DocDescr()
+     vereq(OldClass.__doc__, 'object=None; type=OldClass')
+     vereq(OldClass().__doc__, 'object=OldClass instance; type=OldClass')
+     vereq(NewClass.__doc__, 'object=None; type=NewClass')
+     vereq(NewClass().__doc__, 'object=NewClass instance; type=NewClass')
+ 
  def test_main():
      class_docstrings()
***************
*** 2901,2904 ****
--- 2920,2924 ----
      modules()
      pickleslots()
+     docdescriptor()
      if verbose: print "All OK"