[rhmessaging-commits] rhmessaging commits: r3220 - mgmt/trunk/wooly/python/wooly.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2009-03-26 16:09:35 -0400 (Thu, 26 Mar 2009)
New Revision: 3220

Modified:
   mgmt/trunk/wooly/python/wooly/__init__.py
   mgmt/trunk/wooly/python/wooly/parameters.py
Log:
Adding defaulted argument to paramerter.add to avoid an "if" in unmarshal_url_vars.


Modified: mgmt/trunk/wooly/python/wooly/__init__.py
===================================================================
--- mgmt/trunk/wooly/python/wooly/__init__.py	2009-03-26 20:03:29 UTC (rev 3219)
+++ mgmt/trunk/wooly/python/wooly/__init__.py	2009-03-26 20:09:35 UTC (rev 3220)
@@ -47,7 +47,7 @@
 
         return value
 
-    def add(self, session, value):
+    def add(self, session, value, key=None):
         self.set(session, value)
 
     def set(self, session, value):
@@ -625,10 +625,7 @@
                 param = self.page.get_page_parameter_by_path(key)
 
                 if param:
-                    if param.is_dictionary:
-                        param.add(self, param.unmarshal(value), key)
-                    else:
-                        param.add(self, param.unmarshal(value))
+                    param.add(self, param.unmarshal(value), key)
             except ValueError:
                 pass
 

Modified: mgmt/trunk/wooly/python/wooly/parameters.py
===================================================================
--- mgmt/trunk/wooly/python/wooly/parameters.py	2009-03-26 20:03:29 UTC (rev 3219)
+++ mgmt/trunk/wooly/python/wooly/parameters.py	2009-03-26 20:09:35 UTC (rev 3220)
@@ -62,7 +62,7 @@
     def get_default(self, session):
         return copy(self.default)
 
-    def add(self, session, value):
+    def add(self, session, value, key=None):
         lst = self.get(session)
         lst.append(value)
         return lst