Skip to content

Remove support for user_agent_suffix #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maingoh merged 3 commits into from
Sep 25, 2019
Merged

Remove support for user_agent_suffix #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce85043
remove support for user_agent_suffix
maingoh Sep 25, 2019
55c4582
remove support for user_agent_suffix
maingoh Sep 25, 2019
7d60bd2
Build user agent prefix using list
maingoh Sep 25, 2019
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
2 changes: 0 additions & 2 deletions deepomatic/api/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ def __init__(self, *args, **kwargs):
:param user_agent_prefix (optional): Prefix the HTTP User-Agent.
It is recommended to declare your client via this parameter. Example: 'my-app/1.0.0'.
:type user_agent_prefix: string
:param user_agent_suffix (optional): Suffix the HTTP User-Agent.
:type user_agent_suffix: string
:param pool_maxsize (optional): Set `requests.adapters.HTTPAdapter.pool_maxsize` for concurrent calls.
Defaults to 20.
:type pool_maxsize: int
Expand Down
18 changes: 10 additions & 8 deletions deepomatic/api/http_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class RequestsTimeout(object):
class HTTPHelper(object):
def __init__(self, app_id=None, api_key=None, verify_ssl=None,
host=None, version=API_VERSION, check_query_parameters=True,
user_agent_prefix='', user_agent_suffix='', pool_maxsize=20,
user_agent_prefix='', pool_maxsize=20,
requests_timeout=RequestsTimeout.FAST, **kwargs):
"""
Init the HTTP helper with API key and secret.
Expand Down Expand Up @@ -95,16 +95,18 @@ def __init__(self, app_id=None, api_key=None, verify_ssl=None,
'platform': platform.platform()
}

user_agent_list = []

if user_agent_prefix:
self.user_agent = user_agent_prefix + ' '
else:
self.user_agent = ''
user_agent_list.append(user_agent_prefix)

self.user_agent += '{package_title}-python-client/{package_version} requests/{requests_version} python/{python_version} platform/{platform}\
'.format(**user_agent_params)
user_agent_list += [
'{package_title}-python-client/{package_version}',
'requests/{requests_version}',
'python/{python_version} platform/{platform}',
]

if user_agent_suffix:
self.user_agent += ' ' + user_agent_suffix
self.user_agent = ' '.join(user_agent_list).format(**user_agent_params)

self.api_key = str(api_key)
self.app_id = str(app_id)
Expand Down