Changeset 4184

Timestamp:

03/01/08 06:11:25 (9 months ago)

Author:

chrisz

Message:

Inherited template params and member_widgets got mixed up (#1718).

Files:

• branches/1.0/CHANGELOG.txt (modified) (1 diff)
• branches/1.0/turbogears/widgets/meta.py (modified) (4 diffs)
• branches/1.1/turbogears/widgets/base.py (modified) (3 diffs)
• branches/1.1/turbogears/widgets/meta.py (modified) (3 diffs)

branches/1.0/CHANGELOG.txt

@@ -23 +23 @@
-~~~~~
-
-* FieldStorage can now be optional (#1705)
-* Toolbox did not run on projects using Genshi (#1494).
-
+
+
-* Compatibility with SQLAlchemy 0.4.3 (#1721).
-* Better handling of external redirects.

branches/1.0/turbogears/widgets/meta.py

@@ -6 +6 @@
-from itertools import ifilter, count
-from turbogears import validators
+from turbogears.util import setlike
-from formencode.schema import Schema
-
-try:
-    set
-
+ # Python 2.3
-    from sets import Set as set
-
@@ -29 +30 @@
-        # Makes sure we get the union of params and member_widgets
-        # from all our bases.
-_set = set
+ = setlike
-        # template_vars has been deprecated
-        if 'template_vars' in dct:
-_set.update
+.add_all
-            warnings.warn(
-                "Use of template_vars inside a widget is deprecated, "
@@ -39 +40 @@
-                "released and your actual code will stop working.",
-                DeprecationWarning, 2)
-_set = set
+ = setlike
-        compound = False
-        for base in bases:
-_set.update
+.add_all
-            if getattr(base, 'compound', False):
-_set.update
+.add_all
-                compound = True
-_set
+
-            # Swap all params listed at 'params' with a ParamDescriptor
-            try:
@@ -54 +55 @@
-                # declared in a superclass, skip it...
-                pass
-
+
+
-        #XXX: Remove when deprecation is effective
-dct['params']
+params
-        if compound:
-_set
+
-        # Pick params_doc from all bases giving priority to the widget's own
-        params_doc = {}

branches/1.1/turbogears/widgets/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",
@@ -225 +220 @@
-    # directly or indirectly from Widget.
-
-    # update_data has been deprecated
-    update_data = update_params
-
-    def __call__(self, *args, **params):
-        """
@@ -270 +262 @@
-        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

branches/1.1/turbogears/widgets/meta.py

@@ -6 +6 @@
-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"]
@@ -19 +15 @@
-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.
-
-
-
-
-
-
-
-
-
-
-
+
+
-        compound = False
-        for base in bases:
-_set.update
+.add_all
-            if getattr(base, 'compound', False):
-_set.update
+.add_all
-                compound = True
-_set
+
-            # Swap all params listed at 'params' with a ParamDescriptor
-            try:
@@ -54 +33 @@
-                # declared in a superclass, skip it...
-                pass
-
-
-
+
+
-        if compound:
-_set
+
-        # Pick params_doc from all bases giving priority to the widget's own
-        params_doc = {}