diff -r d0fcb1cde990 -r 0d134b173cb1 iro/offer/smtp.py --- a/iro/offer/smtp.py Fri Mar 30 11:49:13 2012 +0200 +++ b/iro/offer/smtp.py Fri Mar 30 15:55:44 2012 +0200 @@ -28,17 +28,16 @@ """ def __init__(self, name): - Provider.__init__(self,name,{"mail":[None]}) - self.options.update({ - "send_from":Option(vEmail,long="Emailaddress from which mail will be sended.",must=True), - "host":Option(lambda x,y:x, long="Hostname of MTA", must=True), - "port":Option(partial(vInteger,minv=0),long="Port of the MTA", default=25), - "user":Option(lambda x,y:x, long="username to login into MTA.",default=""), - "password":Option(lambda x,y:x, long="password to login into MTA.",default=""), - "SSL":Option(vBool,long="use SSL for connection to MTA", default=False), - "TLS":Option(vBool,long="use TLS for connection to MTA", default=False), - }) - self.order.extend(["host","port","user","password","SSL","TLS","send_from"]) + options = [ + ("host", Option(lambda x,y: x, long="Hostname of MTA", must=True)), + ("port", Option(partial(vInteger,minv=0),long="Port of the MTA", default=25)), + ("user", Option(lambda x,y: x, long="username to login into MTA.",default="")), + ("password", Option(lambda x,y: x, long="password to login into MTA.",default="")), + ("SSL", Option(vBool,long="use SSL for connection to MTA", default=False)), + ("TLS", Option(vBool,long="use TLS for connection to MTA", default=False)), + ("send_from", Option(vEmail,long="Emailaddress from which mail will be sended.",must=True)), + ] + Provider.__init__(self,name,{"mail":[None]},options) def send(self, recipient, mail): """sends a mail to recipient