← Back to branch summary

~harlowja/cloud-init/py2-3

« back to all changes in this revision

Viewing changes to cloudinit/sources/helpers/openstack.py

  • Committer: Joshua Harlow
  • Date: 2014-07-08 04:39:03 UTC
  • Revision ID: harlowja@yahoo-inc.com-20140708043903-5iyejdnrab2yvo79
Fix all iteritems() usage and remove (str, basestring) usage

Show diffs side-by-side

added added

removed removed

Lines of Context:
cloudinit/sources/helpers/openstack.py
23
23
import copy
24
24
import os
25
25
 
 
26
import six
 
27
 
26
28
from cloudinit import ec2_utils
27
29
from cloudinit import log as logging
28
30
from cloudinit import sources
224
226
            'version': 2,
225
227
        }
226
228
        data = datafiles(version)
227
 
        for (name, (path, required, translator)) in data.iteritems():
 
229
        for (name, (path, required, translator)) in six.iteritems(data):
228
230
            path = self._path_join(self.base_path, path)
229
231
            data = None
230
232
            found = False
344
346
            raise NonReadable("%s: no files found" % (self.base_path))
345
347
 
346
348
        md = {}
347
 
        for (name, (key, translator, default)) in FILES_V1.iteritems():
 
349
        for (name, (key, translator, default)) in six.iteritems(FILES_V1):
348
350
            if name in found:
349
351
                path = found[name]
350
352
                try: