Merge "Convert heat.common.template_format to use C yaml"

diff --cc heat/common/template_format.py
index fe8b4fb0989268eb47533802f2952a863ea96f73,fe5c4e985098b50ea94e23fcc95cf09991c66847..a77b30dd9b09fd9bcbc646751141e47e73a8f31a
--- 1/heat/common/template_format.py
--- 2/heat/common/template_format.py
+++ b/heat/common/template_format.py
@@@ -37,13 -40,13 +46,13 @@@ yaml_loader.add_constructor(u'tag:yaml.
  # datetime.data which causes problems in API layer when being processed by
  # openstack.common.jsonutils. Therefore, make unicode string out of timestamps
  # until jsonutils can handle dates.
- yaml.Loader.add_constructor(u'tag:yaml.org,2002:timestamp',
+ yaml_loader.add_constructor(u'tag:yaml.org,2002:timestamp',
+                             _construct_yaml_str)
+ yaml_loader.add_constructor(u'tag:yaml.org,2002:timestamp',
                              _construct_yaml_str)
- yaml.SafeLoader.add_constructor(u'tag:yaml.org,2002:timestamp',
-                                 _construct_yaml_str)
  
  
 -def parse(tmpl_str, add_template_sections=True):
 +def parse(tmpl_str):
      '''
      Takes a string and returns a dict containing the parsed structure.
      This includes determination of whether the string is using the

diff --cc heat/tests/test_provider_template.py
Simple merge