Ignore:
Timestamp:
Apr 20, 2011 8:20:36 AM (13 years ago)
Author:
zidane
Message:

fixes pep8

File:
1 edited

Legend:

Unmodified
Added
Removed
  • quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/tests/testBlackoutList.py

    r3002 r3152  
    3131        super(TestFilterMixin, self).afterSetUp() 
    3232        self.createTestContent() 
    33         self.sm = _createObjectByType('Sitemap', self.portal, id='google-sitemaps') 
     33        self.sm = _createObjectByType('Sitemap', self.portal, 
     34                                      id='google-sitemaps') 
    3435        self.req = self.app.REQUEST 
    35         self.catres = self.portal.portal_catalog(portal_type=["Document",]) 
     36        self.catres = self.portal.portal_catalog(portal_type=["Document", ]) 
    3637        self.logout() 
    3738 
     
    3940        # Add testing content to portal 
    4041        for cont in [self.portal, self.folder]: 
    41             for i in range(1,4): 
     42            for i in range(1, 4): 
    4243                doc = _createObjectByType('Document', cont, id='doc%i' % i) 
    4344                doc.edit(text_format='plain', text='hello world %i' % i) 
     
    4849 
    4950    def getPreparedLists(self, fname, fargs): 
    50         fengine = queryMultiAdapter((self.sm, self.req), IBlackoutFilter, name=fname) 
     51        fengine = queryMultiAdapter((self.sm, self.req), IBlackoutFilter, 
     52                                    name=fname) 
    5153        filtered = [f.getPath() for f in fengine.filterOut(self.catres, fargs)] 
    5254        catpaths = [c.getPath() for c in self.catres] 
     
    6163                    "/%s/doc1" % self.folder.absolute_url(1)] 
    6264        self.assertTrue( 
    63             set(catpaths)-set(filtered) == set(excluded), 
    64             'Wrong filtered-out by "id" filter:\nsrc %s\nres %s\nexcluded %s' % ( 
    65              catpaths, filtered, excluded)) 
     65            set(catpaths) - set(filtered) == set(excluded), 
     66            'Wrong filtered-out by "id" filter:\nsrc %s\nres %s\nexcluded %s' \ 
     67            % (catpaths, filtered, excluded)) 
    6668 
    6769    def testAbsolutePathFilter(self): 
     
    7274        excluded = ["/%s/doc1" % self.portal.absolute_url(1)] 
    7375        self.assertTrue( 
    74             set(catpaths)-set(filtered) == set(excluded), 
    75             'Wrong filtered-out by "path" filter:\nsrc %s\nres %s\nexcluded %s' % ( 
    76              catpaths, filtered, excluded)) 
     76            set(catpaths) - set(filtered) == set(excluded), 
     77            'Wrong filtered-out by "path" filter:\nsrc %s\nres %s\nexcluded ' \ 
     78            '%s' % (catpaths, filtered, excluded)) 
    7779 
    7880    def testRelativePathFilter(self): 
    79         self.sm = _createObjectByType('Sitemap', self.folder, id='google-sitemaps') 
     81        self.sm = _createObjectByType('Sitemap', self.folder, 
     82                                      id='google-sitemaps') 
    8083        catpaths, filtered = self.getPreparedLists("path", "./doc1") 
    8184        self.assertTrue(type(filtered) in [ListType, TupleType], 
     
    8487        excluded = ["/%s/doc1" % self.folder.absolute_url(1)] 
    8588        self.assertTrue( 
    86             set(catpaths)-set(filtered) == set(excluded), 
    87             'Wrong filtered-out by "path" filter:\nsrc %s\nres %s\nexcluded %s' % ( 
    88              catpaths, filtered, excluded)) 
    89  
     89            set(catpaths) - set(filtered) == set(excluded), 
     90            'Wrong filtered-out by "path" filter:\nsrc %s\nres %s\nexcluded ' \ 
     91            '%s' % (catpaths, filtered, excluded)) 
    9092 
    9193 
     
    9597        super(TestBlacklistFormProcessing, self).afterSetUp() 
    9698        self.loginAsPortalOwner() 
    97         self.smview = queryMultiAdapter((self.sm, self.app.REQUEST), name="sitemap.xml") 
     99        self.smview = queryMultiAdapter((self.sm, self.app.REQUEST), 
     100                                        name="sitemap.xml") 
    98101 
    99102    def getPreparedLists(self, bl, fargs): 
    100         self.sm.edit(blackout_list=[bl,]) 
     103        self.sm.edit(blackout_list=[bl, ]) 
    101104        filtered = [f['url'] for f in self.smview.results()] 
    102105        catpaths = [c.getURL() for c in self.catres] 
     
    106109        catpaths, filtered = self.getPreparedLists("path:/doc1", "/plone/doc1") 
    107110        excluded = ["%s/doc1" % self.portal.absolute_url()] 
    108         self.assertTrue(set(catpaths)-set(filtered) == set(excluded), 
    109             'Wrong filtered-out by "id" filter:\nsrc %s\nres %s\nexcluded %s' % ( 
    110              catpaths, filtered, excluded)) 
     111        self.assertTrue(set(catpaths) - set(filtered) == set(excluded), 
     112            'Wrong filtered-out by "id" filter:\nsrc %s\nres %s\nexcluded %s' \ 
     113            % (catpaths, filtered, excluded)) 
    111114 
    112115    def testDefaultFilterUtility(self): 
     
    114117        excluded = ["%s/doc1" % self.portal.absolute_url(), 
    115118                    "%s/doc1" % self.folder.absolute_url()] 
    116         self.assertTrue(set(catpaths)-set(filtered) == set(excluded), 
    117             'Wrong filtered-out by "id" filter:\nsrc %s\nres %s\nexcluded %s' % ( 
    118              catpaths, filtered, excluded)) 
     119        self.assertTrue(set(catpaths) - set(filtered) == set(excluded), 
     120            'Wrong filtered-out by "id" filter:\nsrc %s\nres %s\nexcluded %s' \ 
     121            % (catpaths, filtered, excluded)) 
    119122        # Now check is output of unnamed filter samed to named one. 
    120         self.sm.edit(blackout_list=["doc1",]) 
     123        self.sm.edit(blackout_list=["doc1", ]) 
    121124        filtered_dflt = [f['url'] for f in self.smview.results()] 
    122125        map(lambda l: l.sort(), (filtered, filtered_dflt)) 
     
    134137    #     self.sm.edit(blackout_list="FooFilterName:arg1:arg2:doc1") 
    135138    #     self.smview.results() 
    136     #     self.assertTrue("FooFilterName" in call_names, 
    137     #         "Wrong filter name parsing - no FooFilterName in %s" % call_names) 
     139    #     self.assertTrue("FooFilterName" in call_names, "Wrong filter " \ 
     140    #         "name parsing - no FooFilterName in %s" % call_names) 
    138141    #     component._api.queryMutliAdapter = origQMA 
    139          
    140          
    141          
     142 
    142143 
    143144def test_suite(): 
Note: See TracChangeset for help on using the changeset viewer.