openstack/deb-murano
Code Issues Proposed changes

Merge "Fixed endless recursion loop when super() called in base class"

Browse Source
This commit is contained in:
Jenkins
2014-06-11 11:53:37 +00:00
committed by Gerrit Code Review
parent 3fa62df3cc 316c9bc8ed
commit fe6dec9da7
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
murano/dsl/yaql_functions.py
View File

@@ -54,7 +54,7 @@ def _id(value):
@yaql.context.ContextAware() @yaql.context.ContextAware()
def _cast(context, value, type): def _cast(context, value, type):
if not '.' in type: if not '.' in type:
murano_class = context.get_data('$?type') murano_class = helpers.get_type(context)
type = murano_class.namespace_resolver.resolve_name(type) type = murano_class.namespace_resolver.resolve_name(type)
class_loader = helpers.get_class_loader(context) class_loader = helpers.get_class_loader(context)
return value.cast(class_loader.get_class(type)) return value.cast(class_loader.get_class(type))
@@ -87,18 +87,22 @@ def _new(context, name, *args):
@yaql.context.EvalArg('value', murano_object.MuranoObject) @yaql.context.EvalArg('value', murano_object.MuranoObject)
def _super(value): @yaql.context.ContextAware()
return [value.cast(type) for type in value.type.parents] def _super(context, value):
cast_type = helpers.get_type(context)
return [value.cast(type) for type in cast_type.parents]
@yaql.context.EvalArg('value', murano_object.MuranoObject) @yaql.context.EvalArg('value', murano_object.MuranoObject)
def _super2(value, func): @yaql.context.ContextAware()
return itertools.imap(func, _super(value)) def _super2(context, value, func):
return itertools.imap(func, _super(context, value))
@yaql.context.EvalArg('value', murano_object.MuranoObject) @yaql.context.EvalArg('value', murano_object.MuranoObject)
def _psuper2(value, func): @yaql.context.ContextAware()
helpers.parallel_select(_super(value), func) def _psuper2(context, value, func):
helpers.parallel_select(_super(context, value), func)
@yaql.context.EvalArg('value', object) @yaql.context.EvalArg('value', object)