[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/ - fixed encoding
Yvo Schubbe
cvs-admin at zope.org
Mon Jun 25 11:24:06 UTC 2012
Log message for revision 127068:
- fixed encoding
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_members.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py 2012-06-25 09:16:24 UTC (rev 127067)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py 2012-06-25 11:24:01 UTC (rev 127068)
@@ -166,11 +166,13 @@
"""Identify members to be deleted and redirect to confirmation
template"""
mtool = getUtility(IMembershipTool)
+ charset = self._getDefaultCharset()
members = []
for member_id in self._get_ids(data):
- fullname = mtool.getMemberById(member_id).getProperty('fullname')
- members.append('{0} ({1})'.format(fullname, member_id))
- self.guillotine = ", ".join(members)
+ member = mtool.getMemberById(member_id)
+ fullname = member.getProperty('fullname').decode(charset)
+ members.append(u'{0} ({1})'.format(fullname, member_id))
+ self.guillotine = u', '.join(members)
return self.delete_template()
def handle_delete(self, action, data):
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_members.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_members.py 2012-06-25 09:16:24 UTC (rev 127067)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_members.py 2012-06-25 11:24:01 UTC (rev 127068)
@@ -23,6 +23,7 @@
from Products.CMFCore.interfaces import IActionsTool
from Products.CMFCore.interfaces import IMembershipTool
+from Products.CMFCore.interfaces import IPropertiesTool
from Products.CMFCore.interfaces import IURLTool
from Products.CMFCore.tests.base.dummy import DummySite
from Products.CMFCore.tests.base.dummy import DummyTool
@@ -72,10 +73,12 @@
def setUp(self):
"""Setup a site"""
self.site = DummySite('site')
+ self.site.default_charset = 'ascii'
self.mtool = DummyMemberTool()
sm = getSiteManager()
sm.registerUtility(DummyTool(), IActionsTool)
sm.registerUtility(self.mtool, IMembershipTool)
+ sm.registerUtility(DummyTool().__of__(self.site), IPropertiesTool)
sm.registerUtility(DummyTool().__of__(self.site), IURLTool)
def tearDown(self):
More information about the checkins
mailing list