Changeset 818

Show
Ignore:
Timestamp:
03/06/07 06:59:29
Author:
koval
Message:

added PASMemberdataHandler, modified product tests

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • qMemberdataExport/trunk/Extensions/getMemberData.py

    r817 r818  
    2222    members = memberdatahandler.getAllMembers() 
    2323 
     24    #PASMemberdata handler doesn't set this attribute  
     25    memberdatahandler.fieldnames = memberdatahandler.listAllMemberProperties(exclude_props, include_props) 
     26 
    2427    if batch > len(members) - start: batch = len(members) - start 
    2528 
     
    3437 
    3538    res = StringIO() 
    36     writer = csv.DictWriter(res, fieldnames = memberdatahandler.fieldnames, quoting=csv.QUOTE_ALL) 
     39    writer = csv.DictWriter(res, fieldnames = memberdatahandler.fieldnames, extrasaction='ignore', quoting=csv.QUOTE_ALL) 
    3740 
    3841    # writing header row 
  • qMemberdataExport/trunk/README.txt

    r817 r818  
    55 
    66    Simple product for exporting information about all portal members. 
    7     Compatible with CMFMember portal member
     7    Compatible with CMFMember, PlonePAS, membrane (remember) portal members
  • qMemberdataExport/trunk/__init__.py

    r817 r818  
    99from BaseMemberdataHandler import BaseMemberdataHandler 
    1010from CMFMemberdataHandler import CMFMemberdataHandler 
     11from PASMemberdataHandler import PASMemberdataHandler 
  • qMemberdataExport/trunk/tests/commonTestingStuff.py

    r817 r818  
    1212except ImportError: 
    1313    cmfmember_installed = False 
     14 
     15try: 
     16    from Products import PlonePAS 
     17    pas_installed = True 
     18except ImportError: 
     19    pas_installed = False 
    1420 
    1521PRODUCTS = ['qMemberdataExport',] 
     
    3945    from cStringIO import StringIO 
    4046    from Products.qMemberdataExport import getRegisteredMemberdataHandlers as registry 
    41     from Products.qMemberdataExport import CMFMemberdataHandler, BaseMemberdataHandler 
     47    from Products.qMemberdataExport import PASMemberdataHandler, CMFMemberdataHandler, BaseMemberdataHandler 
    4248 
    4349    datahandler = False 
     
    5258    if datahandler: 
    5359        props = datahandler.listAllMemberProperties(exclude_props=EXCLUDE_PROPS, include_props=INCLUDE_PROPS) 
    54         if cmfmember_installed: 
     60        if pas_installed: 
     61            self.assertEquals(datahandler.__class__, PASMemberdataHandler) 
     62        elif cmfmember_installed: 
    5563            self.assertEquals(datahandler.__class__, CMFMemberdataHandler) 
    5664        else: 
  • qMemberdataExport/trunk/tests/testExternalMethod.py

    r817 r818  
    1616 
    1717        self.loginAsPortalOwner() 
    18         self.qi = getToolByName(self.portal, 'portal_quickinstaller') 
    1918        self.method = getattr(self.portal, EXTERNAL_METHOD) 
    2019        self.membership = self.portal.portal_membership 
  • qMemberdataExport/trunk/tests/testFunctional.py

    r817 r818  
    1616        self.auth = 'admin:secret' 
    1717        self.loginAsPortalOwner() 
    18         self.qi = getToolByName(self.portal, 'portal_quickinstaller') 
    1918        self.membership = self.portal.portal_membership 
    2019        self.path = '%s/%s' % (self.portal.id, EXTERNAL_METHOD) 
  • qMemberdataExport/trunk/tests/testInstallation.py

    r817 r818  
    2424        """ Test registration of memberdata handlers """ 
    2525        from Products.qMemberdataExport import getRegisteredMemberdataHandlers as registry 
    26         self.failUnless(len(registry()) == 2, 'Bad registry data') 
     26        self.failUnless(len(registry()) == 3, 'Bad registry data') 
    2727 
    2828#tests.append(TestInstallation)