Changeset 4238

Timestamp:

07/06/08 12:34:37 (5 months ago)

Author:

ed

Message:

Extended the handling of attProperties to all classes, not just those that inherit from dPemMixin. This was the cause of the problems reported by Nate Lowrie regarding grids created in the ClassDesigner?, since dColumn is subclassed directly from dObject, and setting the properties of dColumn objects from attProperties was not being handled.

Files:

• trunk/dabo/dObject.py (modified) (3 diffs)
• trunk/dabo/lib/DesignerXmlConverter.py (modified) (1 diff)
• trunk/dabo/lib/propertyHelperMixin.py (modified) (1 diff)

trunk/dabo/dObject.py

@@ -34 +34 @@
-    _call_beforeInit, _call_afterInit, _call_initProperties = True, True, True
-
-
+attProperties=None, 
-        if not hasattr(self, "_properties"):
-            self._properties = {}
@@ -46 +46 @@
-        # or override the properties set in beforeInit().
-        
+        # Some classes that are not inherited from the ui-layer PEM mixin classes
+        # can have attProperties passed. Since these are all passed as strings, we
+        # need to convert them to their proper type and add them to the properties
+        # dict.
+        if properties is None:
+            properties = {}
+        if attProperties:
+            for prop, val in attProperties.items():
+                if prop in ("designerClass", ):
+                    continue
+                if prop in properties:
+                    # The properties value has precedence, so ignore.
+                    continue
+                typ = type(getattr(self, prop))
+                if not issubclass(typ, basestring):
+                    val = typ(val)
+                properties[prop] = val
+
-        # The keyword properties can come from either, both, or none of:
-        #    + the properties dict
@@ -55 +73 @@
-                self._properties[k] = v
-        properties = self._extractKeywordProperties(kwargs, self._properties)
-#       if kwargs:
-#           # Some kwargs haven't been handled.
-#           raise TypeError, _("__init__() got an unexpected keyword argument '%s'") % kwargs.keys()[0]
-        if kwargs:
-            # Some kwargs haven't been handled.

trunk/dabo/lib/DesignerXmlConverter.py

@@ -757 +757 @@
-        self._grdColText = """      col = dabo.ui.dColumn(obj, attProperties=%(kidCleanAtts)s)
-        obj.addColumn(col)
-        col.setPropertiesFromAtts(%(kidCleanAtts)s)
-"""
-        self._pgfPageText = """     pg = %(moduleString)s%(nm)s(%(prntName)s%(attPropString)s)

trunk/dabo/lib/propertyHelperMixin.py

@@ -231 +231 @@
-                    raise AttributeError, "'%s' is not a property." % prop
-            setattr(self, prop, val)
-#           if isinstance(eval("self.%s" % prop), basestring):
-#               # If this is property holds strings, we need to quote the value.
-#               try:
-#                   exec("self.%s = '%s'" % (prop, val) )
-#               except :
-#                   raise ValueError, "Could not set property '%s' to value: %s" % (prop, val)
-#           else:
-#               try:
-#                   exec("self.%s = %s" % (prop, val) )
-#               except:
-#                   # Still could be a string, if the original value was None
-#                   try:
-#                       exec("self.%s = '%s'" % (prop, val) )
-#                   except:
-#                       raise ValueError, "Could not set property '%s' to value: %s" % (prop, val)
-        
-