diff --git a/pep-0252.txt b/pep-0252.txt index f2d7b0f57..7b19eadcb 100644 --- a/pep-0252.txt +++ b/pep-0252.txt @@ -540,7 +540,7 @@ C API - In the more complicated case, there's a conflict between names 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 + 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 (like __dict__ and __class__), which have priority over the @@ -555,14 +555,14 @@ C API 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. + instance dict overrides the class dict.) 3. Look in the type dict again (in reality this uses the saved result from step 1, of course). If you find a descriptor, use its get() method; if you find something else, that's it; if it's not there, raise AttributeError. - This requires a classification of descriptors in data and + 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 are read-only!) and member descriptors as nondata.