From 42c1fee6f112b83809e87cb34b228cffc403e64c Mon Sep 17 00:00:00 2001 From: Romain Dorgueil Date: Sun, 22 Oct 2017 16:21:44 +0200 Subject: [PATCH] [core] (..., dict) means Bag(..., **dict) --- bonobo/execution/node.py | 2 ++ bonobo/ext/django.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bonobo/execution/node.py b/bonobo/execution/node.py index 2aa626c..28a20b3 100644 --- a/bonobo/execution/node.py +++ b/bonobo/execution/node.py @@ -159,6 +159,8 @@ def _resolve(input_bag, output): return Bag(**output) if istuple(output): + if len(output) > 1 and isdict(output[-1]): + return Bag(*output[0:-1], **output[-1]) return Bag(*output) # Either we use arg0 format, either it's "just" a value. diff --git a/bonobo/ext/django.py b/bonobo/ext/django.py index 1bd3fff..232fd5a 100644 --- a/bonobo/ext/django.py +++ b/bonobo/ext/django.py @@ -1,6 +1,7 @@ +from logging import getLogger + from colorama import Fore, Back, Style from django.core.management.base import BaseCommand, OutputWrapper -from logging import getLogger import bonobo import bonobo.util