ajack 2004/03/18 15:56:44 Modified: python/gump/output nag.py python/gump/model workspace.py Log: edit,test,edit,test,edit,test,edit,commit
... oops.. edit,test,commit.. Revision Changes Path 1.30 +2 -4 gump/python/gump/output/nag.py Index: nag.py =================================================================== RCS file: /home/cvs/gump/python/gump/output/nag.py,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- nag.py 18 Mar 2004 23:24:56 -0000 1.29 +++ nag.py 18 Mar 2004 23:56:44 -0000 1.30 @@ -110,7 +110,7 @@ # Workspace can override... - (wsTo, wsFrom) = self.workspace.getOverrides() + (wsTo, wsFrom) = self.workspace.getNagOverrides() # Belt and braces (nag to us if not nag to them) if self.hasUnwanted(): @@ -253,13 +253,11 @@ # Send those e-mails self.sendEmails(self.getAddressPairs(project),subject,content) - def g - def getAddressPairs(self, object): nags=[] # Workspace can override... - (wsTo, wsFrom) = self.workspace.getOverrides() + (wsTo, wsFrom) = self.workspace.getNagOverrides() for nagEntry in object.xml.nag: # 1.35 +8 -8 gump/python/gump/model/workspace.py Index: workspace.py =================================================================== RCS file: /home/cvs/gump/python/gump/model/workspace.py,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- workspace.py 18 Mar 2004 23:24:55 -0000 1.34 +++ workspace.py 18 Mar 2004 23:56:44 -0000 1.35 @@ -522,16 +522,16 @@ return self.xml.nag def hasNagToOverride(self): - return self.isNag() and hasattr(self.workspace.xml.nag,'to') + return self.isNag() and hasattr(self.xml.nag,'to') def getNagToOverride(self): - return getattr(self.workspace.xml.nag,'to') + return getattr(self.xml.nag,'to') def hasNagFromOverride(self): - return self.isNag() and hasattr(self.workspace.xml.nag,'from') + return self.isNag() and hasattr(self.xml.nag,'from') def getNagFromOverride(self): - return getattr(self.workspace.xml.nag,'from') + return getattr(self.xml.nag,'from') def getNagOverrides(self): @@ -541,11 +541,11 @@ wsNagToOverrideAddr=None wsNagFromOverrideAddr=None - if self.workspace.hasNagToOverride(): - wsNagToOverrideAddr=self.workspace.getNagToOverride() + if self.hasNagToOverride(): + wsNagToOverrideAddr=self.getNagToOverride() - if self.workspace.hasNagFromOverride(): - wsNagFromOverrideAddr=self.workspace.getNagFromOverride() + if self.hasNagFromOverride(): + wsNagFromOverrideAddr=self.getNagFromOverride() return ( wsNagToOverrideAddr, wsNagFromOverrideAddr) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]