Ticket #1718: template_params_1_0.patch

meta.py

@@ -5 +5 @@
 from new import instancemethod
 from itertools import ifilter, count
 from turbogears import validators
+from turbogears.util import setlike
 from formencode.schema import Schema
 
 try:
     set
-except NameError:
+except NameError: # Python 2.3
     from sets import Set as set
 
 __all__ = ["MetaWidget", "load_kid_template"]
@@ -28 +29 @@
                 DeprecationWarning, 2)
         # Makes sure we get the union of params and member_widgets
         # from all our bases.
-        params_set = set(dct.get('params', []))
+        params = setlike(dct.get('params', []))
         # template_vars has been deprecated
         if 'template_vars' in dct:
-            params_set.update(dct['template_vars'])
+            params.add_all(dct['template_vars'])
             warnings.warn(
                 "Use of template_vars inside a widget is deprecated, "
                 "use params instead. "
                 "Note: this warning will be removed once 1.0 is "
                 "released and your actual code will stop working.",
                 DeprecationWarning, 2)
-        member_widgets_set = set(dct.get('member_widgets', []))
+        member_widgets = setlike(dct.get('member_widgets', []))
         compound = False
         for base in bases:
-            params_set.update(getattr(base, 'params', []))
+            params.add_all(getattr(base, 'params', []))
             if getattr(base, 'compound', False):
-                member_widgets_set.update(getattr(base, 'member_widgets', []))
+                member_widgets.add_all(getattr(base, 'member_widgets', []))
                 compound = True
-        for param in params_set:
+        for param in params:
             # Swap all params listed at 'params' with a ParamDescriptor
             try:
                 dct[param_prefix+param] = dct[param]
@@ -53 +54 @@
             except KeyError:
                 # declared in a superclass, skip it...
                 pass
-        dct['params'] = list(params_set)
+        params = list(params)
+        dct['params'] = params
         #XXX: Remove when deprecation is effective
-        dct['template_vars'] = dct['params']
+        dct['template_vars'] = params
         if compound:
-            dct['member_widgets'] = list(member_widgets_set)
+            dct['member_widgets'] = list(member_widgets)
         # Pick params_doc from all bases giving priority to the widget's own
         params_doc = {}
         for base in bases: