X-Git-Url: http://git.tremily.us/?p=cookbook.git;a=blobdiff_plain;f=cookbook%2Fserver.py;h=99dba5eaf85175e3939f7af0be4b48b46c5d010e;hp=19b3d588099f1ab694979b688b018548d2e8f39d;hb=8ae3e236ef25cda6b47473dda67fa9ec08851b90;hpb=668f81ee37bafa65fe89ec90734f0c876ffa4a3d diff --git a/cookbook/server.py b/cookbook/server.py index 19b3d58..99dba5e 100644 --- a/cookbook/server.py +++ b/cookbook/server.py @@ -211,9 +211,9 @@ class Server (object): m = regexp.match(key) if m != None: handler = getattr(self, '_action_%s' % k) - action = handler(recipe, action, value, *m.groups(), - ingredient_block_map=ingredient_block_map, - ingredient_map=ingredient_map) + kws = {'ingredient_block_map': ingredient_block_map, + 'ingredient_map': ingredient_map} + action = handler(recipe, action, value, *m.groups(), **kws) break # button updates action = kwargs.get('action', action) @@ -225,9 +225,9 @@ class Server (object): m = regexp.match(action) if m != None: handler = getattr(self, '_action_%s' % a) - action = handler(recipe, action, *m.groups(), - ingredient_block_map=ingredient_block_map, - ingredient_map=ingredient_map) + kws = {'ingredient_block_map': ingredient_block_map, + 'ingredient_map': ingredient_map} + action = handler(recipe, action, *m.groups(), **kws) break return (name, recipe, action)