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

The name of yaml exceptions is more consistent between Py2->3

Browse source
This commit is contained in:
Jack Danger Canty 2017-05-11 07:15:07 -07:00
commit 9801d22629
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
moto/cloudformation/models.py
View file

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