[Python-checkins] CVS: python/nondist/peps pep-0252.txt,1.15,1.16

2001年7月29日 16:25:02 -0700

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv31673
Modified Files:
	pep-0252.txt 
Log Message:
Fix typos detected by Terry Reedy.
Index: pep-0252.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0252.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** pep-0252.txt	2001年07月29日 23:02:52	1.15
--- pep-0252.txt	2001年07月29日 23:25:00	1.16
***************
*** 541,545 ****
 stored in the instance dict and names stored in the type dict.
 If both dicts have an entry with the same key, which one should
! we return? Looking as classic Python for guidance, I find
 conflicting rules: for class instances, the instance dict
 overrides the class dict, *except* for the special attributes
--- 541,545 ----
 stored in the instance dict and names stored in the type dict.
 If both dicts have an entry with the same key, which one should
! we return? Looking at classic Python for guidance, I find
 conflicting rules: for class instances, the instance dict
 overrides the class dict, *except* for the special attributes
***************
*** 556,560 ****
 2. Look in the instance dict. If you find anything, that's it.
 (This takes care of the requirement that normally the
! instance dict overrides the class dict.

 3. Look in the type dict again (in reality this uses the saved
--- 556,560 ----
 2. Look in the instance dict. If you find anything, that's it.
 (This takes care of the requirement that normally the
! instance dict overrides the class dict.)

 3. Look in the type dict again (in reality this uses the saved
***************
*** 563,567 ****
 if it's not there, raise AttributeError.

! This requires a classification of descriptors in data and
 nondata descriptors. The current implementation quite sensibly
 classifies member and getset descriptors as data (even if they
--- 563,567 ----
 if it's not there, raise AttributeError.

! This requires a classification of descriptors as data and
 nondata descriptors. The current implementation quite sensibly
 classifies member and getset descriptors as data (even if they