diff options
| author | Barry Warsaw <barry@python.org> | 2015-01-21 17:56:53 -0500 |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2015-01-21 17:56:53 -0500 |
| commit | f895cb12141281702b34da18f2384deb64c881e7 (patch) | |
| tree | 7a7433752ba1317c370dd3dd815c9ee7331a923b /cloudinit/config/cc_phone_home.py | |
| parent | a64bb4febc79fcf641f6471d8cc00c74ca915f3d (diff) | |
| download | vyos-cloud-init-f895cb12141281702b34da18f2384deb64c881e7.tar.gz vyos-cloud-init-f895cb12141281702b34da18f2384deb64c881e7.zip | |
Largely merge lp:~harlowja/cloud-init/py2-3 albeit manually because it seemed
to be behind trunk.
`tox -e py27` passes full test suite. Now to work on replacing mocker.
Diffstat (limited to 'cloudinit/config/cc_phone_home.py')
| -rw-r--r-- | cloudinit/config/cc_phone_home.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_phone_home.py b/cloudinit/config/cc_phone_home.py index 5bc68b83..18a7ddad 100644 --- a/cloudinit/config/cc_phone_home.py +++ b/cloudinit/config/cc_phone_home.py @@ -81,7 +81,7 @@ def handle(name, cfg, cloud, log, args): 'pub_key_ecdsa': '/etc/ssh/ssh_host_ecdsa_key.pub', } - for (n, path) in pubkeys.iteritems(): + for (n, path) in pubkeys.items(): try: all_keys[n] = util.load_file(path) except: @@ -99,7 +99,7 @@ def handle(name, cfg, cloud, log, args): # Get them read to be posted real_submit_keys = {} - for (k, v) in submit_keys.iteritems(): + for (k, v) in submit_keys.items(): if v is None: real_submit_keys[k] = 'N/A' else: |