switch to requests for HTTP queries

2013-06-08 22:27:24 -07:00
parent 259c222623
commit 5cb88f3cf8
23 changed files with 131 additions and 161 deletions
--- a/modules/wuvt.py
+++ b/modules/wuvt.py
@@ -6,7 +6,6 @@ Copyright 2012, Randy Nance, randynance.info
 http://github.com/randynobx/phenny/
 """

-from urllib.error import URLError, HTTPError
 from tools import GrumbleError
 import re
 import web
@@ -19,7 +18,7 @@ def wuvt(phenny, input) :
    try:
        playing = web.get('http://www.wuvt.vt.edu/playlists/latest_track.php')
        djpage = web.get('http://www.wuvt.vt.edu/playlists/current_dj.php')
-    except (URLError, HTTPError):
+    except:
        raise GrumbleError('Cannot connect to wuvt')
    play= r_play.search(playing)
    song = play.group(2)