openstack
/
heat
Code Issues Proposed changes

Merge "Fix errors with issubclass() in Python 3.7"

This commit is contained in:
Zuul 2018-08-09 20:53:47 +00:00 committed by Gerrit Code Review
parent b95ca369bb bcd430cf4d
commit 6832a64542
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat/engine/template.py
View File

@ -366,7 +366,8 @@ def parse(functions, stack, snippet, path='', template=None):
if Func is not None:
try:
path = '.'.join([path, fn_name])
if issubclass(Func, function.Macro):
if (isinstance(Func, type) and
issubclass(Func, function.Macro)):
return Func(stack, fn_name, args,
functools.partial(recurse, path=path),
template)