Merge pull request #1276 from kyrias/title-timeout

Add timeout to `web title` command
This commit is contained in:
Valentin Lorentz 2016-12-08 18:22:02 +01:00 committed by GitHub
commit 76170080b5
1 changed files with 3 additions and 1 deletions

View File

@ -147,7 +147,9 @@ class Web(callbacks.PluginRegexp):
def getTitle(self, irc, url, raiseErrors):
size = conf.supybot.protocols.http.peekSize()
(target, text) = utils.web.getUrlTargetAndContent(url, size=size)
timeout = self.registryValue('timeout')
(target, text) = utils.web.getUrlTargetAndContent(url, size=size,
timeout=timeout)
try:
text = text.decode(utils.web.getEncoding(text) or 'utf8',
'replace')