Merge branch 'staging'

Author: tifayuki

dockercloud/__init__.py

@@ -25,7 +25,7 @@
 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")

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))