changeset: 75903:113b8e3cbba4
branch: 2.7
parent: 75900:0b960e41e533
user: Vinay Sajip <vinay_sajip@yahoo.co.uk>
date: Fri Mar 23 14:33:00 2012 +0000
files: Lib/logging/handlers.py
description:
Closes #14314: backported fix.
diff -r 0b960e41e533 -r 113b8e3cbba4 Lib/logging/handlers.py
--- a/Lib/logging/handlers.py	Fri Mar 23 15:04:27 2012 +0100
+++ b/Lib/logging/handlers.py	Fri Mar 23 14:33:00 2012 +0000
@@ -868,6 +868,7 @@
 self.toaddrs = toaddrs
 self.subject = subject
 self.secure = secure
+ self._timeout = 5.0
 
 def getSubject(self, record):
 """
@@ -890,7 +891,7 @@
 port = self.mailport
 if not port:
 port = smtplib.SMTP_PORT
- smtp = smtplib.SMTP(self.mailhost, port)
+ smtp = smtplib.SMTP(self.mailhost, port, timeout=self._timeout)
 msg = self.format(record)
 msg = "From: %s\r\nTo: %s\r\nSubject: %s\r\nDate: %s\r\n\r\n%s" % (
 self.fromaddr,
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/113b8e3cbba4">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/113b8e3cbba4" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>