From: W. Trevor King <wking@drexel.edu>
Date: Fri, 23 Jul 2010 01:25:29 +0000 (-0400)
Subject: Python 2.5 doesn't allow fn(*args, imap=value)
X-Git-Tag: v0.1~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8ae3e236ef25cda6b47473dda67fa9ec08851b90;p=cookbook.git

Python 2.5 doesn't allow fn(*args, imap=value)
---

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)