From 3a4f220ffb8ff1c34cb219a5c655da74ab409040 Mon Sep 17 00:00:00 2001 From: "Klaus S. Madsen" Date: Fri, 1 Jul 2022 12:28:09 +0200 Subject: [PATCH 1/2] Make pingdom-pythong installable with setuptools >= 57.5.0 --- pingdom/connection.py | 6 +++--- setup.py | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pingdom/connection.py b/pingdom/connection.py index 13a056a..f6d2e5a 100644 --- a/pingdom/connection.py +++ b/pingdom/connection.py @@ -77,7 +77,7 @@ def fetch(self): log.debug(msg) response = getattr(requests, self.method)(url=self.url, data=self.post_data, auth=self.auth, headers=self.headers) - except requests.exceptions.RequestException, e: + except requests.exceptions.RequestException as e: raise PingdomError(e) return PingdomResponse(response) @@ -156,7 +156,7 @@ def create_check(self, name, host, check_type, **kwargs): try: resp = PingdomRequest(self, 'checks', post_data=post_data).fetch() - except PingdomError, e: + except PingdomError as e: logging.error(e) else: return PingdomCheck(resp.content['check']) @@ -171,7 +171,7 @@ def modify_check(self, check_id, **kwargs): rs = 'checks/%s' % check_id response = PingdomRequest(self, rs, post_data=post_data, method='PUT').fetch() - except PingdomError, e: + except PingdomError as e: logging.error(e) else: return response.content['message'] diff --git a/setup.py b/setup.py index 3e72da1..63cf2e1 100755 --- a/setup.py +++ b/setup.py @@ -2,10 +2,6 @@ import sys from setuptools import setup -extra = {} -if sys.version_info >= (3,): - extra['use_2to3'] = True - setup(name='pingdom', version="0.2.1", description='Pingdom Library', @@ -23,5 +19,4 @@ 'License :: OSI Approved :: Apache Software License', 'Operating System :: OS Independent', 'Topic :: System :: Monitoring', ], - **extra ) From 42dc4deb37c4c4dc6c610fa416c0395fb9b69a1b Mon Sep 17 00:00:00 2001 From: Rainer 'rei' Schuth Date: Fri, 11 Aug 2023 11:29:48 -0500 Subject: [PATCH 2/2] Bump version to 0.2.2 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 63cf2e1..9e6563c 100755 --- a/setup.py +++ b/setup.py @@ -3,12 +3,12 @@ from setuptools import setup setup(name='pingdom', - version="0.2.1", + version="0.2.2", description='Pingdom Library', long_description="""3rd-party Python interface to Pingdom's REST API.""", author='Mike Babineau', author_email='michael.babineau@gmail.com', - install_requires=[ 'requests>=0.10.8' ], + install_requires=[ 'requests>=0.10.8', 'setuptools>=57.5.0' ], url='https://github.com/mbabineau/pingdom-python', packages=['pingdom'], license='Apache v2.0',