summaryrefslogtreecommitdiff
path: root/scripting
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-06-29 12:20:16 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-06-29 12:20:16 +0100
commit6843ce885e3e128d24ea8472da4883de223213cd (patch)
tree4486feb869ce167cf21864d14ffdbd2f3f40d7fe /scripting
parentff3c4e9e54efff3b8701fb562291a9edacae8100 (diff)
Resolves: fdo#38713 fix multiple recipients in mailmerge
It appears I don't know the correct syntax for concatenating tuples Change-Id: I32756caeaabfcc52e521108da917aeadf8256caa
Diffstat (limited to 'scripting')
-rwxr-xr-xscripting/source/pyprov/mailmerge.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py
index 38a40d1348b9..f8ccbd6af76e 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -397,12 +397,12 @@ class PyMailMessage(unohelper.Base, XMailMessage):
print >> dbgout, "PyMailMessage init"
self.ctx = ctx
- self.recipients = sTo,
+ self.recipients = (sTo,)
self.ccrecipients = ()
self.bccrecipients = ()
self.aMailAttachments = ()
if aMailAttachment != None:
- self.aMailAttachments = aMailAttachment,
+ self.aMailAttachments = (aMailAttachment,)
self.SenderName, self.SenderAddress = parseaddr(sFrom)
self.ReplyToAddress = sFrom
@@ -413,15 +413,15 @@ class PyMailMessage(unohelper.Base, XMailMessage):
def addRecipient( self, recipient ):
if dbg:
print >> dbgout, "PyMailMessage.addRecipient", recipient
- self.recipients = self.recipients, recipient
+ self.recipients = self.recipients + (recipient,)
def addCcRecipient( self, ccrecipient ):
if dbg:
print >> dbgout, "PyMailMessage.addCcRecipient", ccrecipient
- self.ccrecipients = self.ccrecipients, ccrecipient
+ self.ccrecipients = self.ccrecipients + (ccrecipient,)
def addBccRecipient( self, bccrecipient ):
if dbg:
print >> dbgout, "PyMailMessage.addBccRecipient", bccrecipient
- self.bccrecipients = self.bccrecipients, bccrecipient
+ self.bccrecipients = self.bccrecipients + (bccrecipient,)
def getRecipients( self ):
if dbg:
print >> dbgout, "PyMailMessage.getRecipients", self.recipients
@@ -437,7 +437,7 @@ class PyMailMessage(unohelper.Base, XMailMessage):
def addAttachment( self, aMailAttachment ):
if dbg:
print >> dbgout, "PyMailMessage.addAttachment"
- self.aMailAttachments = self.aMailAttachments, aMailAttachment
+ self.aMailAttachments = self.aMailAttachments + (aMailAttachment,)
def getAttachments( self ):
if dbg:
print >> dbgout, "PyMailMessage.getAttachments"