Skip to content

C
core
Kaydet (Commit) 2462391f authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

mailmerge.py: fix obvious Python 3 issues 

Change-Id: I796696fbfe1756d625dcabc56c8769bed3d5dbc1
üst 7c294529
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 59 deletions
scripting/source/pyprov/mailmerge.py
Dosyayı görüntüle @ 2462391f
...@@ -34,13 +34,13 @@ from com.sun.star.lang import IllegalArgumentException ...@@ -34,13 +34,13 @@ from com.sun.star.lang import IllegalArgumentException
from com.sun.star.lang import EventObject from com.sun.star.lang import EventObject
from com.sun.star.mail import SendMailMessageFailedException from com.sun.star.mail import SendMailMessageFailedException
from email.MIMEBase import MIMEBase from email.mime.base import MIMEBase
from email.Message import Message from email.message import Message
from email import Encoders from email.encoders import encode_base64
from email.Header import Header from email.header import Header
from email.MIMEMultipart import MIMEMultipart from email.mime.multipart import MIMEMultipart
from email.Utils import formatdate from email.utils import formatdate
from email.Utils import parseaddr from email.utils import parseaddr
import sys, smtplib, imaplib, poplib import sys, smtplib, imaplib, poplib
dbg = False dbg = False
...@@ -61,23 +61,23 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): ...@@ -61,23 +61,23 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
self.connectioncontext = None self.connectioncontext = None
self.notify = EventObject() self.notify = EventObject()
if dbg: if dbg:
print >> dbgout, "PyMailSMPTService init" print("PyMailSMPTService init", file=dbgout)
def addConnectionListener(self, xListener): def addConnectionListener(self, xListener):
if dbg: if dbg:
print >> dbgout, "PyMailSMPTService addConnectionListener" print("PyMailSMPTService addConnectionListener", file=dbgout)
self.listeners.append(xListener) self.listeners.append(xListener)
def removeConnectionListener(self, xListener): def removeConnectionListener(self, xListener):
if dbg: if dbg:
print >> dbgout, "PyMailSMPTService removeConnectionListener" print("PyMailSMPTService removeConnectionListener", file=dbgout)
self.listeners.remove(xListener) self.listeners.remove(xListener)
def getSupportedConnectionTypes(self): def getSupportedConnectionTypes(self):
if dbg: if dbg:
print >> dbgout, "PyMailSMPTService getSupportedConnectionTypes" print("PyMailSMPTService getSupportedConnectionTypes", file=dbgout)
return self.supportedtypes return self.supportedtypes
def connect(self, xConnectionContext, xAuthenticator): def connect(self, xConnectionContext, xAuthenticator):
self.connectioncontext = xConnectionContext self.connectioncontext = xConnectionContext
if dbg: if dbg:
print >> dbgout, "PyMailSMPTService connect" print("PyMailSMPTService connect", file=dbgout)
server = xConnectionContext.getValueByName("ServerName") server = xConnectionContext.getValueByName("ServerName")
if dbg: if dbg:
print >> dbgout, server print >> dbgout, server
...@@ -110,7 +110,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): ...@@ -110,7 +110,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
listener.connected(self.notify) listener.connected(self.notify)
def disconnect(self): def disconnect(self):
if dbg: if dbg:
print >> dbgout, "PyMailSMPTService disconnect" print("PyMailSMPTService disconnect", file=dbgout)
if self.server: if self.server:
self.server.quit() self.server.quit()
self.server = None self.server = None
...@@ -118,17 +118,17 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): ...@@ -118,17 +118,17 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
listener.disconnected(self.notify) listener.disconnected(self.notify)
def isConnected(self): def isConnected(self):
if dbg: if dbg:
print >> dbgout, "PyMailSMPTService isConnected" print("PyMailSMPTService isConnected", file=dbgout)
return self.server != None return self.server != None
def getCurrentConnectionContext(self): def getCurrentConnectionContext(self):
if dbg: if dbg:
print >> dbgout, "PyMailSMPTService getCurrentConnectionContext" print("PyMailSMPTService getCurrentConnectionContext", file=dbgout)
return self.connectioncontext return self.connectioncontext
def sendMailMessage(self, xMailMessage): def sendMailMessage(self, xMailMessage):
COMMASPACE = ', ' COMMASPACE = ', '
if dbg: if dbg:
print >> dbgout, "PyMailSMPTService sendMailMessage" print("PyMailSMPTService sendMailMessage", file=dbgout)
recipients = xMailMessage.getRecipients() recipients = xMailMessage.getRecipients()
sendermail = xMailMessage.SenderAddress sendermail = xMailMessage.SenderAddress
sendername = xMailMessage.SenderName sendername = xMailMessage.SenderName
...@@ -136,10 +136,10 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): ...@@ -136,10 +136,10 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
ccrecipients = xMailMessage.getCcRecipients() ccrecipients = xMailMessage.getCcRecipients()
bccrecipients = xMailMessage.getBccRecipients() bccrecipients = xMailMessage.getBccRecipients()
if dbg: if dbg:
print >> dbgout, "PyMailSMPTService subject", subject print("PyMailSMPTService subject " + subject, file=dbgout)
print >> dbgout, "PyMailSMPTService from", sendername.encode('utf-8') print("PyMailSMPTService from " + sendername.encode('utf-8'), file=dbgout)
print >> dbgout, "PyMailSMTPService from", sendermail print("PyMailSMTPService from " + sendermail, file=dbgout)
print >> dbgout, "PyMailSMPTService send to", recipients print("PyMailSMPTService send to " + recipients, file=dbgout)
attachments = xMailMessage.getAttachments() attachments = xMailMessage.getAttachments()
...@@ -148,13 +148,13 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): ...@@ -148,13 +148,13 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
content = xMailMessage.Body content = xMailMessage.Body
flavors = content.getTransferDataFlavors() flavors = content.getTransferDataFlavors()
if dbg: if dbg:
print >> dbgout, "PyMailSMPTService flavors len", len(flavors) print("PyMailSMPTService flavors len " + len(flavors), file=dbgout)
#Use first flavor that's sane for an email body #Use first flavor that's sane for an email body
for flavor in flavors: for flavor in flavors:
if flavor.MimeType.find('text/html') != -1 or flavor.MimeType.find('text/plain') != -1: if flavor.MimeType.find('text/html') != -1 or flavor.MimeType.find('text/plain') != -1:
if dbg: if dbg:
print >> dbgout, "PyMailSMPTService mimetype is", flavor.MimeType print("PyMailSMPTService mimetype is " + flavor.MimeType, file=dbgout)
textbody = content.getTransferData(flavor) textbody = content.getTransferData(flavor)
try: try:
textbody = textbody.value textbody = textbody.value
...@@ -215,7 +215,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): ...@@ -215,7 +215,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
msgattachment = MIMEBase(maintype, subtype) msgattachment = MIMEBase(maintype, subtype)
data = content.getTransferData(flavor) data = content.getTransferData(flavor)
msgattachment.set_payload(data) msgattachment.set_payload(data)
Encoders.encode_base64(msgattachment) encode_base64(msgattachment)
msgattachment.add_header('Content-Disposition', 'attachment', \ msgattachment.add_header('Content-Disposition', 'attachment', \
filename=attachment.ReadableName) filename=attachment.ReadableName)
msg.attach(msgattachment) msg.attach(msgattachment)
...@@ -232,7 +232,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): ...@@ -232,7 +232,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
truerecipients = uniquer.keys() truerecipients = uniquer.keys()
if dbg: if dbg:
print >> dbgout, "PyMailSMPTService recipients are", truerecipients print("PyMailSMPTService recipients are " + truerecipients, file=dbgout)
self.server.sendmail(sendermail, truerecipients, msg.as_string()) self.server.sendmail(sendermail, truerecipients, msg.as_string())
...@@ -245,22 +245,22 @@ class PyMailIMAPService(unohelper.Base, XMailService): ...@@ -245,22 +245,22 @@ class PyMailIMAPService(unohelper.Base, XMailService):
self.connectioncontext = None self.connectioncontext = None
self.notify = EventObject() self.notify = EventObject()
if dbg: if dbg:
print >> dbgout, "PyMailIMAPService init" print("PyMailIMAPService init", file=dbgout)
def addConnectionListener(self, xListener): def addConnectionListener(self, xListener):
if dbg: if dbg:
print >> dbgout, "PyMailIMAPService addConnectionListener" print("PyMailIMAPService addConnectionListener", file=dbgout)
self.listeners.append(xListener) self.listeners.append(xListener)
def removeConnectionListener(self, xListener): def removeConnectionListener(self, xListener):
if dbg: if dbg:
print >> dbgout, "PyMailIMAPService removeConnectionListener" print("PyMailIMAPService removeConnectionListener", file=dbgout)
self.listeners.remove(xListener) self.listeners.remove(xListener)
def getSupportedConnectionTypes(self): def getSupportedConnectionTypes(self):
if dbg: if dbg:
print >> dbgout, "PyMailIMAPService getSupportedConnectionTypes" print("PyMailIMAPService getSupportedConnectionTypes", file=dbgout)
return self.supportedtypes return self.supportedtypes
def connect(self, xConnectionContext, xAuthenticator): def connect(self, xConnectionContext, xAuthenticator):
if dbg: if dbg:
print >> dbgout, "PyMailIMAPService connect" print("PyMailIMAPService connect", file=dbgout)
self.connectioncontext = xConnectionContext self.connectioncontext = xConnectionContext
server = xConnectionContext.getValueByName("ServerName") server = xConnectionContext.getValueByName("ServerName")
...@@ -272,12 +272,12 @@ class PyMailIMAPService(unohelper.Base, XMailService): ...@@ -272,12 +272,12 @@ class PyMailIMAPService(unohelper.Base, XMailService):
connectiontype = xConnectionContext.getValueByName("ConnectionType") connectiontype = xConnectionContext.getValueByName("ConnectionType")
if dbg: if dbg:
print >> dbgout, connectiontype print >> dbgout, connectiontype
print >> dbgout, "BEFORE" print("BEFORE", file=dbgout)
if connectiontype == 'Ssl': if connectiontype == 'Ssl':
self.server = imaplib.IMAP4_SSL(server, port) self.server = imaplib.IMAP4_SSL(server, port)
else: else:
self.server = imaplib.IMAP4(server, port) self.server = imaplib.IMAP4(server, port)
print >> dbgout, "AFTER" print("AFTER", file=dbgout)
user = xAuthenticator.getUserName().encode('ascii') user = xAuthenticator.getUserName().encode('ascii')
password = xAuthenticator.getPassword().encode('ascii') password = xAuthenticator.getPassword().encode('ascii')
...@@ -290,7 +290,7 @@ class PyMailIMAPService(unohelper.Base, XMailService): ...@@ -290,7 +290,7 @@ class PyMailIMAPService(unohelper.Base, XMailService):
listener.connected(self.notify) listener.connected(self.notify)
def disconnect(self): def disconnect(self):
if dbg: if dbg:
print >> dbgout, "PyMailIMAPService disconnect" print("PyMailIMAPService disconnect", file=dbgout)
if self.server: if self.server:
self.server.logout() self.server.logout()
self.server = None self.server = None
...@@ -298,11 +298,11 @@ class PyMailIMAPService(unohelper.Base, XMailService): ...@@ -298,11 +298,11 @@ class PyMailIMAPService(unohelper.Base, XMailService):
listener.disconnected(self.notify) listener.disconnected(self.notify)
def isConnected(self): def isConnected(self):
if dbg: if dbg:
print >> dbgout, "PyMailIMAPService isConnected" print("PyMailIMAPService isConnected", file=dbgout)
return self.server != None return self.server != None
def getCurrentConnectionContext(self): def getCurrentConnectionContext(self):
if dbg: if dbg:
print >> dbgout, "PyMailIMAPService getCurrentConnectionContext" print("PyMailIMAPService getCurrentConnectionContext", file=dbgout)
return self.connectioncontext return self.connectioncontext
class PyMailPOP3Service(unohelper.Base, XMailService): class PyMailPOP3Service(unohelper.Base, XMailService):
...@@ -314,22 +314,22 @@ class PyMailPOP3Service(unohelper.Base, XMailService): ...@@ -314,22 +314,22 @@ class PyMailPOP3Service(unohelper.Base, XMailService):
self.connectioncontext = None self.connectioncontext = None
self.notify = EventObject() self.notify = EventObject()
if dbg: if dbg:
print >> dbgout, "PyMailPOP3Service init" print("PyMailPOP3Service init", file=dbgout)
def addConnectionListener(self, xListener): def addConnectionListener(self, xListener):
if dbg: if dbg:
print >> dbgout, "PyMailPOP3Service addConnectionListener" print("PyMailPOP3Service addConnectionListener", file=dbgout)
self.listeners.append(xListener) self.listeners.append(xListener)
def removeConnectionListener(self, xListener): def removeConnectionListener(self, xListener):
if dbg: if dbg:
print >> dbgout, "PyMailPOP3Service removeConnectionListener" print("PyMailPOP3Service removeConnectionListener", file=dbgout)
self.listeners.remove(xListener) self.listeners.remove(xListener)
def getSupportedConnectionTypes(self): def getSupportedConnectionTypes(self):
if dbg: if dbg:
print >> dbgout, "PyMailPOP3Service getSupportedConnectionTypes" print("PyMailPOP3Service getSupportedConnectionTypes", file=dbgout)
return self.supportedtypes return self.supportedtypes
def connect(self, xConnectionContext, xAuthenticator): def connect(self, xConnectionContext, xAuthenticator):
if dbg: if dbg:
print >> dbgout, "PyMailPOP3Service connect" print("PyMailPOP3Service connect", file=dbgout)
self.connectioncontext = xConnectionContext self.connectioncontext = xConnectionContext
server = xConnectionContext.getValueByName("ServerName") server = xConnectionContext.getValueByName("ServerName")
...@@ -341,12 +341,12 @@ class PyMailPOP3Service(unohelper.Base, XMailService): ...@@ -341,12 +341,12 @@ class PyMailPOP3Service(unohelper.Base, XMailService):
connectiontype = xConnectionContext.getValueByName("ConnectionType") connectiontype = xConnectionContext.getValueByName("ConnectionType")
if dbg: if dbg:
print >> dbgout, connectiontype print >> dbgout, connectiontype
print >> dbgout, "BEFORE" print("BEFORE", file=dbgout)
if connectiontype == 'Ssl': if connectiontype == 'Ssl':
self.server = poplib.POP3_SSL(server, port) self.server = poplib.POP3_SSL(server, port)
else: else:
self.server = poplib.POP3(server, port) self.server = poplib.POP3(server, port)
print >> dbgout, "AFTER" print("AFTER", file=dbgout)
user = xAuthenticator.getUserName().encode('ascii') user = xAuthenticator.getUserName().encode('ascii')
password = xAuthenticator.getPassword().encode('ascii') password = xAuthenticator.getPassword().encode('ascii')
...@@ -359,7 +359,7 @@ class PyMailPOP3Service(unohelper.Base, XMailService): ...@@ -359,7 +359,7 @@ class PyMailPOP3Service(unohelper.Base, XMailService):
listener.connected(self.notify) listener.connected(self.notify)
def disconnect(self): def disconnect(self):
if dbg: if dbg:
print >> dbgout, "PyMailPOP3Service disconnect" print("PyMailPOP3Service disconnect", file=dbgout)
if self.server: if self.server:
self.server.quit() self.server.quit()
self.server = None self.server = None
...@@ -367,21 +367,21 @@ class PyMailPOP3Service(unohelper.Base, XMailService): ...@@ -367,21 +367,21 @@ class PyMailPOP3Service(unohelper.Base, XMailService):
listener.disconnected(self.notify) listener.disconnected(self.notify)
def isConnected(self): def isConnected(self):
if dbg: if dbg:
print >> dbgout, "PyMailPOP3Service isConnected" print("PyMailPOP3Service isConnected", file=dbgout)
return self.server != None return self.server != None
def getCurrentConnectionContext(self): def getCurrentConnectionContext(self):
if dbg: if dbg:
print >> dbgout, "PyMailPOP3Service getCurrentConnectionContext" print("PyMailPOP3Service getCurrentConnectionContext", file=dbgout)
return self.connectioncontext return self.connectioncontext
class PyMailServiceProvider(unohelper.Base, XMailServiceProvider): class PyMailServiceProvider(unohelper.Base, XMailServiceProvider):
def __init__( self, ctx ): def __init__( self, ctx ):
if dbg: if dbg:
print >> dbgout, "PyMailServiceProvider init" print("PyMailServiceProvider init", file=dbgout)
self.ctx = ctx self.ctx = ctx
def create(self, aType): def create(self, aType):
if dbg: if dbg:
print >> dbgout, "PyMailServiceProvider create with", aType print("PyMailServiceProvider create with " + aType, file=dbgout)
if aType == SMTP: if aType == SMTP:
return PyMailSMTPService(self.ctx); return PyMailSMTPService(self.ctx);
elif aType == POP3: elif aType == POP3:
...@@ -389,12 +389,12 @@ class PyMailServiceProvider(unohelper.Base, XMailServiceProvider): ...@@ -389,12 +389,12 @@ class PyMailServiceProvider(unohelper.Base, XMailServiceProvider):
elif aType == IMAP: elif aType == IMAP:
return PyMailIMAPService(self.ctx); return PyMailIMAPService(self.ctx);
else: else:
print >> dbgout, "PyMailServiceProvider, unknown TYPE", aType print("PyMailServiceProvider, unknown TYPE " + aType, file=dbgout)
class PyMailMessage(unohelper.Base, XMailMessage): class PyMailMessage(unohelper.Base, XMailMessage):
def __init__( self, ctx, sTo='', sFrom='', Subject='', Body=None, aMailAttachment=None ): def __init__( self, ctx, sTo='', sFrom='', Subject='', Body=None, aMailAttachment=None ):
if dbg: if dbg:
print >> dbgout, "PyMailMessage init" print("PyMailMessage init", file=dbgout)
self.ctx = ctx self.ctx = ctx
self.recipients = (sTo,) self.recipients = (sTo,)
...@@ -409,38 +409,38 @@ class PyMailMessage(unohelper.Base, XMailMessage): ...@@ -409,38 +409,38 @@ class PyMailMessage(unohelper.Base, XMailMessage):
self.Subject = Subject self.Subject = Subject
self.Body = Body self.Body = Body
if dbg: if dbg:
print >> dbgout, "post PyMailMessage init" print("post PyMailMessage init", file=dbgout)
def addRecipient( self, recipient ): def addRecipient( self, recipient ):
if dbg: if dbg:
print >> dbgout, "PyMailMessage.addRecipient", recipient print("PyMailMessage.addRecipient " + recipient, file=dbgout)
self.recipients = self.recipients + (recipient,) self.recipients = self.recipients + (recipient,)
def addCcRecipient( self, ccrecipient ): def addCcRecipient( self, ccrecipient ):
if dbg: if dbg:
print >> dbgout, "PyMailMessage.addCcRecipient", ccrecipient print("PyMailMessage.addCcRecipient " + ccrecipient, file=dbgout)
self.ccrecipients = self.ccrecipients + (ccrecipient,) self.ccrecipients = self.ccrecipients + (ccrecipient,)
def addBccRecipient( self, bccrecipient ): def addBccRecipient( self, bccrecipient ):
if dbg: if dbg:
print >> dbgout, "PyMailMessage.addBccRecipient", bccrecipient print("PyMailMessage.addBccRecipient " + bccrecipient, file=dbgout)
self.bccrecipients = self.bccrecipients + (bccrecipient,) self.bccrecipients = self.bccrecipients + (bccrecipient,)
def getRecipients( self ): def getRecipients( self ):
if dbg: if dbg:
print >> dbgout, "PyMailMessage.getRecipients", self.recipients print("PyMailMessage.getRecipients " + self.recipients, file=dbgout)
return self.recipients return self.recipients
def getCcRecipients( self ): def getCcRecipients( self ):
if dbg: if dbg:
print >> dbgout, "PyMailMessage.getCcRecipients", self.ccrecipients print("PyMailMessage.getCcRecipients " + self.ccrecipients, file=dbgout)
return self.ccrecipients return self.ccrecipients
def getBccRecipients( self ): def getBccRecipients( self ):
if dbg: if dbg:
print >> dbgout, "PyMailMessage.getBccRecipients", self.bccrecipients print("PyMailMessage.getBccRecipients " + self.bccrecipients, file=dbgout)
return self.bccrecipients return self.bccrecipients
def addAttachment( self, aMailAttachment ): def addAttachment( self, aMailAttachment ):
if dbg: if dbg:
print >> dbgout, "PyMailMessage.addAttachment" print("PyMailMessage.addAttachment", file=dbgout)
self.aMailAttachments = self.aMailAttachments + (aMailAttachment,) self.aMailAttachments = self.aMailAttachments + (aMailAttachment,)
def getAttachments( self ): def getAttachments( self ):
if dbg: if dbg:
print >> dbgout, "PyMailMessage.getAttachments" print("PyMailMessage.getAttachments", file=dbgout)
return self.aMailAttachments return self.aMailAttachments
# pythonloader looks for a static g_ImplementationHelper variable # pythonloader looks for a static g_ImplementationHelper variable
......
scripting/source/pyprov/msgbox.py
Dosyayı görüntüle @ 2462391f
...@@ -250,11 +250,11 @@ if __name__ == '__main__': ...@@ -250,11 +250,11 @@ if __name__ == '__main__':
myBox.renderFromBoxSize(150) myBox.renderFromBoxSize(150)
myBox.numberOflines = 2 myBox.numberOflines = 2
print myBox.show("A very long message A very long message A very long message A very long message A very long message A very long message A very long message A very long message A very long message A very long message " + chr(10)+chr(10)+"Do you agree ?",0,"Dialog title") print(myBox.show("A very long message A very long message A very long message A very long message A very long message A very long message A very long message A very long message A very long message A very long message " + chr(10)+chr(10)+"Do you agree ?",0,"Dialog title"))
myBox = MsgBox(ctx) myBox = MsgBox(ctx)
myBox.addButton("oK") myBox.addButton("oK")
myBox.renderFromButtonSize() myBox.renderFromButtonSize()
myBox.numberOflines = 2 myBox.numberOflines = 2
print myBox.show("A small message",0,"Dialog title") print(myBox.show("A small message",0,"Dialog title"))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment