]> jfr.im git - erebus.git/commitdiff
Fixed header
authorConny Sjöblom <redacted>
Tue, 4 Feb 2014 21:56:51 +0000 (23:56 +0200)
committerConny Sjöblom <redacted>
Tue, 4 Feb 2014 21:56:51 +0000 (23:56 +0200)
modules/twitch.py
modules/youtube.py

index 68e6586a037a65752ec2264e2412766073563499..466d430769a9fc800d695c4b6e8fe4f0fe598c6a 100644 (file)
@@ -1,5 +1,5 @@
 # Erebus IRC bot - Author: Conny Sjoblom
-# Spotify URL Checker
+# Twitch URL Checker
 # This file is released into the public domain; see http://unlicense.org/
 
 # module info
@@ -20,7 +20,6 @@ modstop = lib.modstop
 import re
 import urllib2
 import json
-from BeautifulSoup import BeautifulSoup
 
 checkfor = "twitch"
 hostmask_regex = re.compile('^(.*)!(.*)@(.*)$')
index a0c9c9d5f52fef26be9093b6b20d5321e7553f5a..e1c61a39ce4b3bd1d135f746cfd9562e2a4754ea 100644 (file)
@@ -1,5 +1,5 @@
 # Erebus IRC bot - Author: Conny Sjoblom
-# Spotify URL Checker
+# Youtube URL Checker
 # This file is released into the public domain; see http://unlicense.org/
 
 # module info
@@ -66,7 +66,4 @@ def privmsg_hook(bot, line):
                        html_parser = HTMLParser.HTMLParser()
                        respdata = urllib2.urlopen(url).read()
                        soup = BeautifulSoup(respdata)
-                       try:
-                               bot.msg(line.split()[2], BeautifulSoup(soup.title.string, convertEntities=BeautifulSoup.HTML_ENTITIES))
-                       except:
-                               pass
+                       bot.msg(line.split()[2], BeautifulSoup(soup.title.string, convertEntities=BeautifulSoup.HTML_ENTITIES))