Merge pull request CloudBotIRC#189 from linuxdaemon/gonzobot+fix-paste-exceptions

Handle exceptions in web util

Author: edwardslabs

cloudbot/util/web.py

@@ -87,7 +87,12 @@ def try_shorten(self, url, custom=None, key=None):
             return url
 
     def expand(self, url):
-        r = requests.get(url, allow_redirects=False)
+        try:
+            r = requests.get(url, allow_redirects=False)
+            r.raise_for_status()
+        except RequestException as e:
+            r = e.response
+            raise ServiceError(r.status_code, r)
 
         if 'location' in r.headers:
             return r.headers['location']
@@ -127,7 +132,13 @@ def _decorate(impl):
 class Isgd(Shortener):
     def shorten(self, url, custom=None, key=None):
         p = {'url': url, 'shorturl': custom, 'format': 'json'}
-        r = requests.get('http://is.gd/create.php', params=p)
+        try:
+            r = requests.get('http://is.gd/create.php', params=p)
+            r.raise_for_status()
+        except RequestException as e:
+            r = e.response
+            raise ServiceError(r.status_code, r)
+
         j = r.json()
 
         if 'shorturl' in j:
@@ -137,7 +148,13 @@ def shorten(self, url, custom=None, key=None):
 
     def expand(self, url):
         p = {'shorturl': url, 'format': 'json'}
-        r = requests.get('http://is.gd/forward.php', params=p)
+        try:
+            r = requests.get('http://is.gd/forward.php', params=p)
+            r.raise_for_status()
+        except RequestException as e:
+            r = e.response
+            raise ServiceError(r.status_code, r)
+
         j = r.json()
 
         if 'url' in j:
@@ -152,7 +169,13 @@ def shorten(self, url, custom=None, key=None):
         h = {'content-type': 'application/json'}
         k = {'key': key}
         p = {'longUrl': url}
-        r = requests.post('https://www.googleapis.com/urlshortener/v1/url', params=k, data=json.dumps(p), headers=h)
+        try:
+            r = requests.post('https://www.googleapis.com/urlshortener/v1/url', params=k, data=json.dumps(p), headers=h)
+            r.raise_for_status()
+        except RequestException as e:
+            r = e.response
+            raise ServiceError(r.status_code, r)
+
         j = r.json()
 
         if 'error' not in j:
@@ -162,7 +185,13 @@ def shorten(self, url, custom=None, key=None):
 
     def expand(self, url):
         p = {'shortUrl': url}
-        r = requests.get('https://www.googleapis.com/urlshortener/v1/url', params=p)
+        try:
+            r = requests.get('https://www.googleapis.com/urlshortener/v1/url', params=p)
+            r.raise_for_status()
+        except RequestException as e:
+            r = e.response
+            raise ServiceError(r.status_code, r)
+
         j = r.json()
 
         if 'error' not in j:
@@ -175,7 +204,12 @@ def expand(self, url):
 class Gitio(Shortener):
     def shorten(self, url, custom=None, key=None):
         p = {'url': url, 'code': custom}
-        r = requests.post('http://git.io', data=p)
+        try:
+            r = requests.post('http://git.io', data=p)
+            r.raise_for_status()
+        except RequestException as e:
+            r = e.response
+            raise ServiceError(r.status_code, r)
 
         if r.status_code == requests.codes.created:
             s = r.headers['location']
@@ -190,13 +224,19 @@ def shorten(self, url, custom=None, key=None):
 @_pastebin('hastebin')
 class Hastebin(Pastebin):
     def paste(self, data, ext):
-        r = requests.post(HASTEBIN_SERVER + '/documents', data=data)
-        j = r.json()
-
-        if r.status_code is requests.codes.ok:
-            return '{}/{}.{}'.format(HASTEBIN_SERVER, j['key'], ext)
+        try:
+            r = requests.post(HASTEBIN_SERVER + '/documents', data=data)
+            r.raise_for_status()
+        except RequestException as e:
+            r = e.response
+            raise ServiceError(r.status_code, r)
         else:
-            raise ServiceError(j['message'], r)
+            j = r.json()
+
+            if r.status_code is requests.codes.ok:
+                return '{}/{}.{}'.format(HASTEBIN_SERVER, j['key'], ext)
+            else:
+                raise ServiceError(j['message'], r)
 
 
 @_pastebin('snoonet')
@@ -211,6 +251,6 @@ def paste(self, data, ext):
             r.raise_for_status()
         except RequestException as e:
             r = e.response
-            return ServiceError(r.status_code, r)
+            raise ServiceError(r.status_code, r)
         else:
             return '{}'.format(r.url)