ajack 2004/03/28 13:09:26
Modified: python/gump/model depend.py property.py
Log:
I can't reproduce this locally (with the unit test workspace) nor unit tests.
So, reverting to an earleir try & digging in remotely.
Revision Changes Path
1.24 +0 -2 gump/python/gump/model/depend.py
Index: depend.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/depend.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- depend.py 28 Mar 2004 19:04:55 -0000 1.23
+++ depend.py 28 Mar 2004 21:09:26 -0000 1.24
@@ -20,8 +20,6 @@
from gump.model.state import *
from gump.model.object import NamedModelObject
-from gump.model.property import Property
-
from gump.utils.note import *
from gump.utils import getIndent
1.18 +6 -2 gump/python/gump/model/property.py
Index: property.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/property.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- property.py 28 Mar 2004 20:45:03 -0000 1.17
+++ property.py 28 Mar 2004 21:09:26 -0000 1.18
@@ -159,11 +159,11 @@
return self.properties.values()
def importProperty(self,xmlproperty):
- self.addProperty(Property(xmlproperty,self.getOwner()))
+ self.addProperty(Property(xmlproperty,self))
def completeProperties(self,workspace):
for property in self.getProperties():
- property.complete(self.getOwner(),workspace)
+ property.complete(self,workspace)
def dump(self, indent=0, output=sys.stdout):
""" Display the properties """
@@ -203,6 +203,7 @@
self.sysproperties.importProperty(xmlproperty)
def importProperties(self,xml):
+ """ Import all properties (from XML to model). """
if xml.property:
for xmlproperty in xml.property:
self.importProperty(xmlproperty)
@@ -212,7 +213,10 @@
self.importSysProperty(xmlproperty)
def completeProperties(self,workspace=None):
+ # The only entity not to pass the workspace,
+ # can be the workspace itself.
if not workspace: workspace=self
+ # Import normal and system
self.properties.completeProperties(workspace)
self.sysproperties.completeProperties(workspace)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
