Merge pull request #100 from CameronJHall/master

Changed HTTPError to RequestException in Notifier

Author: James Bell

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='tgt_grease',
-    version='2.6.0',
+    version='2.6.1',
     license="MIT",
     description='Modern distributed automation engine built with love by Target',
     long_description="""
@@ -34,6 +34,7 @@
     test_suite='nose.collector',
     tests_require=['nose', 'nose-cover3', 'mock'],
     install_requires=[
+        'urllib3==1.24.3',
         'psycopg2-binary',
         'requests',
         'pymongo',

tgt_grease/core/Notifier.py

@@ -1,6 +1,5 @@
 from tgt_grease.core import Configuration
 from logging import DEBUG, INFO, WARNING, ERROR, CRITICAL
-from urllib3.exceptions import HTTPError
 import requests
 import json
 
@@ -147,7 +146,7 @@ def send_hipchat_message(self, message, level, color=None):
                 return True
             else:
                 return False
-        except HTTPError:
+        except requests.exceptions.RequestException:
             return False
 
     def send_slack_message(self, message):
@@ -170,6 +169,5 @@ def send_slack_message(self, message):
                 headers={'Content-Type': 'application/json'}
             )
             return True
-        except HTTPError:
+        except requests.exceptions.RequestException:
             return False
-