- Revision
- 15326
- Author
- bkirsch
- Date
- 2007-09-12 13:04:55 -0700 (Wed, 12 Sep 2007)
Log Message
fixes bugs 10716 and 10717 by converting hostnames to utf-8 and removing the localization method call around an empty string. r=stearns
Modified Paths
Diff
Modified: trunk/chandler/parcels/osaf/mail/smtp.py (15325 => 15326)
--- trunk/chandler/parcels/osaf/mail/smtp.py 2007-09-12 19:59:29 UTC (rev 15325) +++ trunk/chandler/parcels/osaf/mail/smtp.py 2007-09-12 20:04:55 UTC (rev 15326) @@ -407,11 +407,16 @@ factory.protocol = _TwistedESMTPSender factory.testing = testing + # Convert the Unicode hostname to an str + # before passing to twisted since twisted uses + # a repr of the hostname in error messages. + host = self.account.host.encode("utf-8", "ignore") + if self.account.connectionSecurity == 'SSL': - ssl.connectSSL(self.account.host, self.account.port, factory, + ssl.connectSSL(host, self.account.port, factory, self.view) else: - ssl.connectTCP(self.account.host, self.account.port, factory, + ssl.connectTCP(host, self.account.port, factory, self.view) deferredPassword.addCallback(callback)
Modified: trunk/chandler/parcels/osaf/views/main/Main.py (15325 => 15326)
--- trunk/chandler/parcels/osaf/views/main/Main.py 2007-09-12 19:59:29 UTC (rev 15325) +++ trunk/chandler/parcels/osaf/views/main/Main.py 2007-09-12 20:04:55 UTC (rev 15326) @@ -99,7 +99,7 @@ # buttons after the i18n freeze is over (0.7.1). errorQuestion = _(u"Would you like to") result = Util.promptUserAction( - _(u''), + u'', errorMessage, okayTitle = _(u"Send again"), cancelTitle = _(u"Edit message"))
_______________________________________________ Commits mailing list [email protected] http://lists.osafoundation.org/mailman/listinfo/commits
