-# Erebus IRC bot - Author: Erebus Team
+# Erebus IRC bot - Author: Conny Sjoblom
# vim: fileencoding=utf-8
# URL Checker
# This file is released into the public domain; see http://unlicense.org/
# module code
import sys
if sys.version_info.major < 3:
+ stringbase = basestring
import urllib2
import urlparse
import HTMLParser
+ html = HTMLParser.HTMLParser()
from BeautifulSoup import BeautifulSoup
else:
+ stringbase = str
import urllib.request as urllib2
import urllib.parse as urlparse
- import html.parser as HTMLParser
+ import html
from bs4 import BeautifulSoup
import re, json, datetime
-html_parser = HTMLParser.HTMLParser()
-
hostmask_regex = re.compile(r'^(.*)!(.*)@(.*)$')
def parser_hostmask(hostmask):
num_found += 1
if num_found > limit:
return responses
- resp = action(match)
+ if isinstance(match, stringbase):
+ resp = action(match)
+ else:
+ resp = action(*match)
if resp is not None:
- responses.append("%s: %s" % (prefix, action(match)))
+ responses.append("%s: %s" % (prefix, resp))
return responses
@lib.hooknum("PRIVMSG")
bot.msg(chan, ' | '.join(responses), True)
def unescape(line):
- return re.sub('\s+', ' ', html_parser.unescape(line))
+ return re.sub('\s+', ' ', html.unescape(line))
def gotspotify(type, track):
url = 'http://ws.spotify.com/lookup/1/?uri=spotify:%s:%s' % (type, track)
return None
except urllib2.HTTPError as e:
return 'Error: %s %s' % (e.code, e.reason)
+ except urllib2.URLError as e:
+ return 'Error: %s' % (e.reason)
except Exception as e:
- return 'Error: %r' % (e.message)
+ return 'Error: %r' % (e.args)
url_regex = (
re.compile(r'https?://[^/\s]+\.[^/\s]+(?:/\S+)?'),