Added configure method
Added support for disabling HTTPS SSL verification
This commit is contained in:
parent
d7b74dc1da
commit
5ad540e177
3 changed files with 69 additions and 12 deletions
|
@ -31,14 +31,22 @@ class Http(object):
|
|||
The config_file parameter is used to specify an alternate config file.
|
||||
If the host parameter is specified, no config file is loaded and
|
||||
OAuth tokens (consumer*, token*) can optionally be specified.
|
||||
All requests will include the api_version path, if specified.
|
||||
This should be used to ensure that your application will continue to work
|
||||
even if the Trovebox API is updated to a new revision.
|
||||
"""
|
||||
|
||||
_CONFIG_DEFAULTS = {"api_version" : None,
|
||||
"ssl_verify" : True,
|
||||
}
|
||||
|
||||
def __init__(self, config_file=None, host=None,
|
||||
consumer_key='', consumer_secret='',
|
||||
token='', token_secret='', api_version=None):
|
||||
self._api_version = api_version
|
||||
|
||||
self.config = dict(self._CONFIG_DEFAULTS)
|
||||
|
||||
if api_version is not None:
|
||||
print("Deprecation Warning: api_version should be set by "
|
||||
"calling the configure function")
|
||||
self.config["api_version"] = api_version
|
||||
|
||||
self._logger = logging.getLogger("trovebox")
|
||||
|
||||
|
@ -53,6 +61,20 @@ class Http(object):
|
|||
self.last_params = None
|
||||
self.last_response = None
|
||||
|
||||
def configure(self, **kwds):
|
||||
"""
|
||||
Update Trovebox HTTP client configuration.
|
||||
|
||||
:param api_version: Include a Trovebox API version in all requests.
|
||||
This can be used to ensure that your application will continue
|
||||
to work even if the Trovebox API is updated to a new revision.
|
||||
[default: None]
|
||||
:param ssl_verify: If true, HTTPS SSL certificates will always be
|
||||
verified [default: True]
|
||||
"""
|
||||
for item in kwds:
|
||||
self.config[item] = kwds[item]
|
||||
|
||||
def get(self, endpoint, process_response=True, **params):
|
||||
"""
|
||||
Performs an HTTP GET from the specified endpoint (API path),
|
||||
|
@ -76,6 +98,7 @@ class Http(object):
|
|||
auth = None
|
||||
|
||||
with requests.Session() as session:
|
||||
session.verify = self.config["ssl_verify"]
|
||||
response = session.get(url, params=params, auth=auth)
|
||||
|
||||
self._logger.info("============================")
|
||||
|
@ -114,6 +137,7 @@ class Http(object):
|
|||
self.auth.token,
|
||||
self.auth.token_secret)
|
||||
with requests.Session() as session:
|
||||
session.verify = self.config["ssl_verify"]
|
||||
if files:
|
||||
# Need to pass parameters as URL query, so they get OAuth signed
|
||||
response = session.post(url, params=params,
|
||||
|
@ -153,8 +177,8 @@ class Http(object):
|
|||
|
||||
if not endpoint.startswith("/"):
|
||||
endpoint = "/" + endpoint
|
||||
if self._api_version is not None:
|
||||
endpoint = "/v%d%s" % (self._api_version, endpoint)
|
||||
if self.config["api_version"] is not None:
|
||||
endpoint = "/v%d%s" % (self.config["api_version"], endpoint)
|
||||
return urlunparse((scheme, host, endpoint, '', '', ''))
|
||||
|
||||
@staticmethod
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue