Ticket #1718: template_params_1_1.patch

base.py

@@ -10 +10 @@
 from cherrypy.config import configs
 import tgmochikit
 
-try:
-    set
-except NameError:
-    from sets import Set as set
-
 __all__ = ["load_widgets", "all_widgets", "Widget", "CompoundWidget",
            "WidgetsList", "register_static_directory",
            "static", "Resource", "Link", "CSSLink", "JSLink",
@@ -224 +219 @@
     # there is rarely the need to override or extend them if inheritting
     # directly or indirectly from Widget.
 
-    # update_data has been deprecated
-    update_data = update_params
-
     def __call__(self, *args, **params):
         """
         Delegate to display. Used as an alias to avoid tiresome typing
@@ -269 +261 @@
         params["name"] = self.name
         params["value"] = to_unicode(self.adjust_value(value, **params))
         self.update_params(params)
-        # update_data has been deprecated
-        self.update_data(params)
         try:
             transform = view.engines['kid'].transform
         except (KeyError, AttributeError):

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:
-    from sets import Set as set
-
 __all__ = ["MetaWidget", "load_kid_template"]
 
 param_prefix = '_param_'
 
 class MetaWidget(type):
     def __new__(cls, name, bases, dct):
-        # update_data has been deprecated
-        if 'update_data' in dct and name != "Widget":
-            warnings.warn(
-                "update_data has been renamed update_params, please "
-                "rename your method. "
-                "Note: this warning will be removed once 1.0 is "
-                "released and your actual code will stop working.",
-                DeprecationWarning, 2)
         # Makes sure we get the union of params and member_widgets
         # from all our bases.
-        params_set = set(dct.get('params', []))
-        # template_vars has been deprecated
-        if 'template_vars' in dct:
-            params_set.update(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', []))
+        params = setlike(dct.get('params', []))
+        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 +32 @@
             except KeyError:
                 # declared in a superclass, skip it...
                 pass
-        dct['params'] = list(params_set)
-        #XXX: Remove when deprecation is effective
-        dct['template_vars'] = dct['params']
+        params = list(params)
+        dct['params'] = 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: