[CMF-checkins] CVS: Products/CMFCore - MemberDataTool.py:1.11

[Jens Vagelpohl]

Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv7484

Modified Files:
	MemberDataTool.py 
Log Message:
A better implementation for getProperty on the member data wrapper



=== Products/CMFCore/MemberDataTool.py 1.10 => 1.11 ===
 
         # Then, check the tool for a value other than ''
-        value = tool.getProperty( id, _marker )
-        if value is not _marker:
-            return value
-
-        # Finally, try the user object.
-        value = getattr( self.getUser(), id, default )
-        if value is _marker:
-            raise 'Property not found', id
+        tool_value = tool.getProperty( id, _marker )
+        user_value = getattr( self.getUser(), id, default )
+        
+        if tool_value is not _marker:
+            if not tool_value and not user_value:
+                value = tool_value
+            elif not tool_value and user_value:
+                value = user_value
+        else:
+            if user_value:
+                value = user_value
+            else:
+                raise 'Property not found', id
 
         return value