[Modeling-cvs] ProjectModeling/Modeling KeyValueCoding.py,1.6,1.7

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1:/tmp/cvs-serv23629/Modeling

Modified Files:
	KeyValueCoding.py 
Log Message:
Fixed bug #814007: KeyValueCoding.storedValueForKey() unexpectedly
returned obj.key instead of obj._key when both exist.


Index: KeyValueCoding.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/KeyValueCoding.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** KeyValueCoding.py	3 Jul 2003 23:03:38 -0000	1.6
--- KeyValueCoding.py	28 Sep 2003 14:52:06 -0000	1.7
***************
*** 136,143 ****
      if callable(getter): return getter()
      self_attributes=self.__dict__.keys()
-     if key in self_attributes:             # key property
-       return getattr(self, key)
      if '_'+key in self_attributes:         # _key property
        return getattr(self, '_'+key)
      getter=getattr(self, 'get'+Key, None)  # getKey()
      if callable(getter): return getter()  
--- 136,143 ----
      if callable(getter): return getter()
      self_attributes=self.__dict__.keys()
      if '_'+key in self_attributes:         # _key property
        return getattr(self, '_'+key)
+     if key in self_attributes:             # key property
+       return getattr(self, key)
      getter=getattr(self, 'get'+Key, None)  # getKey()
      if callable(getter): return getter()