← Back to branch summary

~ubuntu-branches/ubuntu/utopic/heat/utopic-proposed

« back to all changes in this revision

Viewing changes to heat/engine/resources/software_config/structured_config.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2014-09-08 09:40:59 UTC
  • mfrom: (1.1.16)
  • Revision ID: package-import@ubuntu.com-20140908094059-pzysrm0uy4senjez
Tags: 2014.2~b3-0ubuntu1
New upstream version. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/engine/resources/software_config/structured_config.py
15
15
 
16
16
import collections
17
17
import functools
 
18
import six
18
19
 
19
20
from heat.engine import properties
20
21
from heat.engine.resources.software_config import software_config as sc
110
111
 
111
112
        if isinstance(snippet, collections.Mapping):
112
113
            if len(snippet) == 1:
113
 
                fn_name, args = next(snippet.iteritems())
 
114
                fn_name, args = next(six.iteritems(snippet))
114
115
                if fn_name == input_key:
115
116
                    if isinstance(args, basestring):
116
117
                        return inputs.get(args)
117
 
            return dict((k, parse(v)) for k, v in snippet.iteritems())
 
118
            return dict((k, parse(v)) for k, v in six.iteritems(snippet))
118
119
        elif (not isinstance(snippet, basestring) and
119
120
              isinstance(snippet, collections.Iterable)):
120
121
            return [parse(v) for v in snippet]