[Commits] (vajda) more on iterAttributes()

[commits at osafoundation.org]

Commit by: vajda
Modified files:
osaf/chandler/Chandler/repository/schema/Kind.py 1.63 1.64

Log message:
more on iterAttributes()


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/chandler/Chandler/repository/schema/Kind.py.diff?r1=text&tr1=1.63&r2=text&tr2=1.64

Index: osaf/chandler/Chandler/repository/schema/Kind.py
diff -u osaf/chandler/Chandler/repository/schema/Kind.py:1.63 osaf/chandler/Chandler/repository/schema/Kind.py:1.64
--- osaf/chandler/Chandler/repository/schema/Kind.py:1.63	Tue Apr 27 19:46:40 2004
+++ osaf/chandler/Chandler/repository/schema/Kind.py	Tue Apr 27 19:58:04 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.63 $"
-__date__      = "$Date: 2004/04/28 02:46:40 $"
+__revision__  = "$Revision: 1.64 $"
+__date__      = "$Date: 2004/04/28 02:58:04 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -65,7 +65,7 @@
 
         child = self.getItemChild(name)
         if child:
-            return child.itsUUID
+            return child._uuid
         
         if self.hasAttributeValue('attributes', _attrDict=self._references):
             return self.attributes.resolveAlias(name)
@@ -148,8 +148,7 @@
                         inheritedAttributes.append(attribute, alias=name)
             for uuid, link in inheritedAttributes._iteritems():
                 name = link._alias
-                if (not self.hasChild(name) and
-                    attributes and not attributes.resolveAlias(name)):
+                if not self.resolve(name):
                     yield (name, link._value.other(self))
 
     def _inheritAttribute(self, name):