projects
/
cookbook.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
668f81e
)
Python 2.5 doesn't allow fn(*args, imap=value)
author
W. Trevor King
<wking@drexel.edu>
Fri, 23 Jul 2010 01:25:29 +0000
(21:25 -0400)
committer
W. Trevor King
<wking@drexel.edu>
Fri, 23 Jul 2010 01:25:29 +0000
(21:25 -0400)
cookbook/server.py
patch
|
blob
|
history
diff --git
a/cookbook/server.py
b/cookbook/server.py
index 19b3d588099f1ab694979b688b018548d2e8f39d..99dba5eaf85175e3939f7af0be4b48b46c5d010e 100644
(file)
--- 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)
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)
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)
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)
break
return (name, recipe, action)