[Zapp-cvs-commit] ZApp ZApp_MiscData.py,1.29,1.30
Brought to you by:
sspickle
|
From: Steve S. <ssp...@us...> - 2004-10-03 11:20:14
|
Update of /cvsroot/zapp/ZApp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23699 Modified Files: ZApp_MiscData.py Log Message: getObjectInfo cat take optional mdObj argument... Index: ZApp_MiscData.py =================================================================== RCS file: /cvsroot/zapp/ZApp/ZApp_MiscData.py,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** ZApp_MiscData.py 24 May 2004 15:20:20 -0000 1.29 --- ZApp_MiscData.py 3 Oct 2004 11:19:50 -0000 1.30 *************** *** 353,357 **** } ! def getMiscDataFor(self, miscNameAttr=DEFAULT_MISCNAMEATTR, dataType=''): """ check for the existence of an attribute of this object with the name given by miscNameAttr --- 353,357 ---- } ! def getMiscDataFor(self, miscNameAttr=DEFAULT_MISCNAMEATTR, dataType='', mdObj=None): """ check for the existence of an attribute of this object with the name given by miscNameAttr *************** *** 369,375 **** return {} ! mdobj = self.getMiscData(dataType=dataType) ! if not mdobj: ! return {} result = {} --- 369,376 ---- return {} ! if not mdObj: ! mdObj = self.getMiscData(dataType=dataType) ! if not mdObj: ! return {} result = {} *************** *** 386,390 **** args = map(lambda x,ca=checkArg: ca(x), typecodeList[1:]) ! value = mdobj.getXMLAttr(attr) if typecode: --- 387,391 ---- args = map(lambda x,ca=checkArg: ca(x), typecodeList[1:]) ! value = mdObj.getXMLAttr(attr) if typecode: *************** *** 396,400 **** return result ! def getObjectInfo(self, miscNameAttr=DEFAULT_MISCNAMEATTR): """ return known attributes/values for object.. --- 397,401 ---- return result ! def getObjectInfo(self, miscNameAttr=DEFAULT_MISCNAMEATTR, mdObj=None): """ return known attributes/values for object.. *************** *** 417,421 **** result[p['id']] = val ! result.update( self.getMiscDataFor( miscNameAttr )) return result --- 418,422 ---- result[p['id']] = val ! result.update( self.getMiscDataFor( miscNameAttr, mdObj=mdObj )) return result |