← Back to branch summary

~ubuntu-branches/ubuntu/wily/heat/wily-proposed

« back to all changes in this revision

Viewing changes to heat/common/template_format.py

  • Committer: Package Import Robot
  • Author(s): James Page, Corey Bryant, James Page
  • Date: 2015-03-30 11:11:18 UTC
  • mfrom: (1.1.23)
  • Revision ID: package-import@ubuntu.com-20150330111118-2qpycylx6swu4yhj
Tags: 2015.1~b3-0ubuntu1
[ Corey Bryant ]
* New upstream milestone release for OpenStack kilo:
  - d/control: Align with upstream dependencies.
  - d/p/sudoers_patch.patch: Rebased.
  - d/p/fix-requirements.patch: Rebased.

[ James Page ]
* d/p/fixup-assert-regex.patch: Tweak test to use assertRegexpMatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/common/template_format.py
12
12
#    under the License.
13
13
 
14
14
import itertools
15
 
import json
16
15
import re
17
16
 
18
 
from oslo.config import cfg
 
17
from oslo_config import cfg
 
18
from oslo_serialization import jsonutils
19
19
import six
20
20
import yaml
21
21
 
50
50
 
51
51
def simple_parse(tmpl_str):
52
52
    try:
53
 
        tpl = json.loads(tmpl_str)
 
53
        tpl = jsonutils.loads(tmpl_str)
54
54
    except ValueError:
55
55
        try:
56
56
            tpl = yaml.load(tmpl_str, Loader=yaml_loader)