Ignore:
Timestamp:
Aug 22, 2012 10:22:22 AM (12 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/setuphandlers.py

    r3163 r3510  
    3131            name = registration.name 
    3232            lsm.unregisterAdapter(factory=factory, 
    33                 required=required, provided=provided, name=name) 
     33                                  required=required, 
     34                                  provided=provided, 
     35                                  name=name) 
    3436            unregistered.append(str(required)) 
    35     logger.info("Unregistered news schema extender adapters for: %s" \ 
     37    logger.info("Unregistered news schema extender adapters for: %s" 
    3638                % unregistered) 
    3739 
    … …  
    8789    if old_product in configlet_ids: 
    8890        controlpanel.unregisterConfiglet(old_product) 
    89         logger.info("Unregistered '%s' configlet from "\ 
     91        logger.info("Unregistered '%s' configlet from " 
    9092                    "portal_controlpanel tool." % old_product) 
    9193    # Remove qPloneGoogleSitemaps skin layer 
    … …  
    9496        paths = [l.strip() for l in skin_paths if not l == old_product] 
    9597        if len(paths) < len(skin_paths): 
    96             logger.info("Removed '%s' from '%s' skin." \ 
     98            logger.info("Removed '%s' from '%s' skin." 
    9799                        % (old_product, skinName)) 
    98100        skins.addSkinSelection(skinName, ','.join(paths)) 
    … …  
    103105    if smaps: 
    104106        logger.info(msg + "Process %s sitemaps." % ( 
    105                 [sm.getPath() for sm in smaps])) 
     107                    [sm.getPath() for sm in smaps])) 
    106108        fields = ['id', 'sitemapType', 'portalTypes', 'states', 
    107109                  'blackout_list', 'reg_exp', 'urls', 'pingTransitions'] 
    … …  
    127129    catalog = getToolByName(site, 'portal_catalog') 
    128130    smaps = catalog(portal_type="Sitemap") 
    129     old_smb = [smb for smb in smaps \ 
     131    old_smb = [smb for smb in smaps 
    130132               if 'qPloneGoogleSitemaps' in str(smb.getObject().__class__)] 
    131133    return old_smb 
Note: See TracChangeset for help on using the changeset viewer.