From 7da96e8a98f612cc00ed819316cd9b68dc21c44e Mon Sep 17 00:00:00 2001 From: tifayuki Date: Thu, 3 Mar 2016 11:50:19 +0100 Subject: [PATCH 1/2] fix the cookies on prepared request --- dockercloud/api/http.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dockercloud/api/http.py b/dockercloud/api/http.py index 081ce91..f1d0696 100644 --- a/dockercloud/api/http.py +++ b/dockercloud/api/http.py @@ -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)) From 890d95e071e48cfa19b1a1abdf3a26522b8e8293 Mon Sep 17 00:00:00 2001 From: tifayuki Date: Thu, 3 Mar 2016 18:23:43 +0100 Subject: [PATCH 2/2] bump version --- dockercloud/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockercloud/__init__.py b/dockercloud/__init__.py index 8f06af8..1607b62 100644 --- a/dockercloud/__init__.py +++ b/dockercloud/__init__.py @@ -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")