Skip to content

Commit

Permalink
Merge pull request #3 from godaddy/mverkerk_dev
Browse files Browse the repository at this point in the history
Release 1.0.2
  • Loading branch information
mverkerk-godaddy committed Jan 18, 2018
2 parents 855afbf + 316379d commit b046514
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 61 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def required_packages_list(file_name, exclude_version=False):
author='GoDaddy Operating Company, LLC',
author_email='mverkerk@godaddy.com',
license='MIT',
version='1.0.1',
version='1.0.2',
install_requires=required_packages_list('requirements.txt'),
packages=find_packages(
exclude=['*.tests', '*.tests.*', 'tests.*', 'tests']))
14 changes: 7 additions & 7 deletions timingsclient/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
""" Init file for timingsclient """
from __future__ import absolute_import

from .perf import Perf
from . import config, perf

__all__ = ['perf', 'config', 'Perf']
""" Init file for timingsclient """
from __future__ import absolute_import

from .perf import Perf
from . import perf

__all__ = ['perf', 'Perf']
52 changes: 0 additions & 52 deletions timingsclient/config.py

This file was deleted.

3 changes: 2 additions & 1 deletion timingsclient/perf.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,12 @@ def _call_api(self, data, endpoint):
json=data, timeout=api_timeout
)
if not 200 <= response.status_code <= 299:
print('timingsclient: Unexpected response from API {}'.format(response))
return {'error': "Error: Unexpected response {}".format(response)}

return response.json()
except requests.exceptions.RequestException as err:
print(err)
print('timingsclient: exception in API request: ' + str(err))
return {'error': err}

def _load_conf(self):
Expand Down

0 comments on commit b046514

Please sign in to comment.