Merge pull request #1 from klynch/master

Better exception handling
jasonarewhy · Sep 10, 2014 · d982e47 · d982e47
2 parents dece755 + 7745381
commit d982e47
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/catchpoint.py b/catchpoint.py
@@ -1,12 +1,14 @@
-#!/usr/bin/env python
-
 import sys
 import base64
 import datetime
 import pytz
 import requests
 
 
+class CatchpointError(Exception):
+    pass
+
+
 class Catchpoint(object):
 
     def __init__(
@@ -82,6 +84,8 @@ def _make_request(self, uri, params=None, data=None):
         }
         try:
             r = requests.get(uri, headers=headers, params=params, data=data)
+            if r.status_code != 200:
+                raise CatchpointError(r.content)
         except requests.ConnectionError, e:
             self._connection_error(e)