catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing broken tests #2126

Browse source 
- KMS
- S3
- CloudFormation (Thanks kgutwin!)
This commit is contained in:
Mike Grima 2019-03-25 13:19:01 -07:00
commit 921b5a3227
5 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
moto/cloudformation/models.py
View file

@ -85,9 +85,9 @@ class FakeStack(BaseModel):
def _parse_template(self):
yaml.add_multi_constructor('', yaml_tag_constructor)
try:
self.template_dict = yaml.load(self.template)
self.template_dict = yaml.load(self.template, Loader=yaml.Loader)
except yaml.parser.ParserError:
self.template_dict = json.loads(self.template)
self.template_dict = json.loads(self.template, Loader=yaml.Loader)
@property
def stack_parameters(self):