jyapayne/python-dockercloud
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'staging'

Browse source
This commit is contained in:
tifayuki 2016-03-03 18:24:20 +01:00
commit 260e7c1355
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dockercloud/__init__.py
View file

@ -25,7 +25,7 @@ from dockercloud.api.utils import Utils
from dockercloud.api.events import Events
from dockercloud.api.nodeaz import AZ
__version__ = '1.0.2'
__version__ = '1.0.3'
dockercloud_auth = os.environ.get('DOCKERCLOUD_AUTH')
basic_auth = auth.load_from_file("~/.docker/config.json")

7
dockercloud/api/http.py
View file

@ -47,14 +47,15 @@ def send_request(method, path, inject_header=True, **kwargs):
# construct request
s = get_session()
req = Request(method, url, headers=headers, **kwargs)
request = Request(method, url, headers=headers, **kwargs)
# get environment proxies
env_proxies = utils.get_environ_proxies(url) or {}
kw_args = {'proxies': env_proxies}
# make the request
logger.info("Request: %s, %s, %s, %s, %s" % (method, url, headers, s.cookies, kwargs))
response = s.send(req.prepare(), **kw_args)
req = s.prepare_request(request)
logger.info("Prepared Request: %s, %s, %s, %s" % (req.method, req.url, req.headers, kwargs))
response = s.send(req, **kw_args)
status_code = getattr(response, 'status_code', None)
logger.info("Response: Status %s, %s, %s" % (str(status_code), response.headers, response.text))