[CMF-checkins] CVS: CMF/CMFCore - MemberDataTool.py:1.28
Tres Seaver
tseaver@zope.com
Fri, 9 May 2003 12:14:59 -0400
Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv6252/CMFCore
Modified Files:
MemberDataTool.py
Log Message:
- Merge getProperty fix from 1.4 branch.
=== CMF/CMFCore/MemberDataTool.py 1.27 => 1.28 ===
--- CMF/CMFCore/MemberDataTool.py:1.27 Fri May 9 11:04:18 2003
+++ CMF/CMFCore/MemberDataTool.py Fri May 9 12:14:59 2003
@@ -146,13 +146,16 @@
search_param = 'id'
for user_wrapper in self._members.values():
- searched = getattr( user_wrapper, search_param, None )
+
+ memberProperty = user_wrapper.getProperty
+ searched = memberProperty( search_param, None )
+
if searched is not None and searched.find(search_term) != -1:
- res.append( { 'username' : getattr( user_wrapper, 'id' )
- , 'email' : getattr( user_wrapper, 'email', '' )
+
+ res.append( { 'username': memberProperty( 'id' )
+ , 'email' : memberProperty( 'email', '' )
}
)
-
return res
security.declarePrivate('pruneMemberDataContents')