← Back to team overview

cloud-init-dev team mailing list archive

[Merge] lp:~harlowja/cloud-init/fix-dict-26 into lp:cloud-init

 

Joshua Harlow has proposed merging lp:~harlowja/cloud-init/fix-dict-26 into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~harlowja/cloud-init/fix-dict-26/+merge/162482

Fixes how 2.6 doesn't yet have the inline dict format.
-- 
https://code.launchpad.net/~harlowja/cloud-init/fix-dict-26/+merge/162482
Your team cloud init development team is requested to review the proposed merge of lp:~harlowja/cloud-init/fix-dict-26 into lp:cloud-init.
=== modified file 'cloudinit/url_helper.py'
--- cloudinit/url_helper.py	2013-04-25 15:58:38 +0000
+++ cloudinit/url_helper.py	2013-05-03 22:13:26 +0000
@@ -165,9 +165,14 @@
     for i in range(0, manual_tries):
         try:
             req_args['headers'] = headers_cb(url)
+            filtered_req_args = {}
+            for (k, v) in req_args.items():
+                if k == 'data':
+                    continue
+                filtered_req_args[k] = v
+
             LOG.debug("[%s/%s] open '%s' with %s configuration", i,
-                      manual_tries, url,
-                      {k: req_args[k] for k in req_args if k != 'data'})
+                      manual_tries, url, filtered_req_args)
 
             r = requests.request(**req_args)
             if check_status:


Follow ups