Ignore:
Timestamp:
Aug 22, 2012 10:22:22 AM (8 years ago)
Author:
potar
Message:

Merged sitemap_date branch into trunk

Location:
quintagroup.plonegooglesitemaps/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • quintagroup.plonegooglesitemaps/trunk

    • Property svn:mergeinfo
      •  

        old new  
        33/quintagroup.plonegooglesitemaps/branches/migratioin_product:2826-2839 
        44/quintagroup.plonegooglesitemaps/branches/plone4:2549-2553 
         5/quintagroup.plonegooglesitemaps/branches/sitemap_date:3481-3509 
        56/quintagroup.plonegooglesitemaps/branches/test_refactoring:2527-2536 
  • quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/tests/testSecurity.py

    r3163 r3510  
    1414 
    1515    def getview(self, vpath): 
    16         return self.publish("/" + self.portal.absolute_url(1) + \ 
     16        return self.publish("/" + self.portal.absolute_url(1) + 
    1717                            "/" + vpath, self.auth) 
    1818 
     
    4444        super(TestSecurityConfigletNotManager, self).afterSetUp() 
    4545        self.auth = "mem:mem" 
    46         self.portal.portal_membership.addMember('mem', 'mem', ('Member',), []) 
     46        self.portal.portal_membership.addMember('mem', 
     47                                                'mem', 
     48                                                ('Member',), 
     49                                                []) 
    4750 
    4851    def testConfigOverview(self): 
     
    5962 
    6063 
    61 SM_TYPES = { 
    62   "content": {"id": "sitemap.xml", "types": ("Document",)}, 
    63   "news": {"id": "news-sitemap.xml", "types": ("News Item",)}, 
    64   "mobile": {"id": "mobile-sitemap.xml", "types": ("Document",)}, 
    65 } 
     64SM_TYPES = {"content": {"id": "sitemap.xml", "types": ("Document",)}, 
     65            "news": {"id": "news-sitemap.xml", "types": ("News Item",)}, 
     66            "mobile": {"id": "mobile-sitemap.xml", "types": ("Document",)}, 
     67            } 
    6668from DateTime import DateTime 
    6769 
Note: See TracChangeset for help on using the changeset viewer.