Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pingdom/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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'])
Expand All @@ -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']
Expand Down
9 changes: 2 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,13 @@
import sys
from setuptools import setup

extra = {}
if sys.version_info >= (3,):
extra['use_2to3'] = True

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='[email protected]',
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',
Expand All @@ -23,5 +19,4 @@
'License :: OSI Approved :: Apache Software License',
'Operating System :: OS Independent',
'Topic :: System :: Monitoring', ],
**extra
)