From 13794d2287b88da3dd376a7df23679bb0ed69434 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 2 May 2019 15:39:22 -0500 Subject: [PATCH 1/3] Changed HTTPError to RequestException Signed-off-by: Cameron Hall --- tgt_grease/core/Notifier.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tgt_grease/core/Notifier.py b/tgt_grease/core/Notifier.py index 56b455f8..4786f8e5 100644 --- a/tgt_grease/core/Notifier.py +++ b/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 - From 2a4e65087885003d9b5d9c1d963339e890b534cd Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 2 May 2019 16:00:48 -0500 Subject: [PATCH 2/3] urllib3 version pinned Signed-off-by: Cameron Hall --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 4ac39665..cb092143 100755 --- a/setup.py +++ b/setup.py @@ -34,6 +34,7 @@ test_suite='nose.collector', tests_require=['nose', 'nose-cover3', 'mock'], install_requires=[ + 'urllib3==1.24.3', 'psycopg2-binary', 'requests', 'pymongo', From c94ed98e8305f8ac1b1e9557010fe3a3ac927212 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 2 May 2019 17:16:02 -0500 Subject: [PATCH 3/3] Bumped version Signed-off-by: Cameron Hall --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index cb092143..82d0e8ba 100755 --- a/setup.py +++ b/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="""