[Zope-CMF] Re: [CMF-checkins] CVS: Products/CMFDefault - Portal.py:1.46

[Florent Guillaume]

This patch breaks our code in CPS:

1. There is now a new arg to setupDefaultProperties that doesn't even
take a default value for backward compat,

2. The 'default_charset' passed isn't used :(

We'll fix it on our side, but <sigh>....

Florent


In article <20041017200424.3A465203160 at mail.zope.org> you write:
> Update of /cvs-repository/Products/CMFDefault
> In directory cvs.zope.org:/tmp/cvs-serv4435/CMFDefault
> 
> Modified Files:
> 	Portal.py 
> Log Message:
> - refactored reconfig_form
> - added 'default_charset' property (http://collector.zope.org/CMF/261, part 2)
> 
> 
> === Products/CMFDefault/Portal.py 1.45 => 1.46 ===
> --- Products/CMFDefault/Portal.py:1.45	Wed Sep  8 11:57:14 2004
> +++ Products/CMFDefault/Portal.py	Sun Oct 17 16:03:53 2004
> @@ -346,11 +346,11 @@
>  
>      def setupDefaultProperties(self, p, title, description,
>                                 email_from_address, email_from_name,
> -                               validate_email,
> -                               ):
> +                               validate_email, default_charset):
>          p._setProperty('email_from_address', email_from_address, 'string')
>          p._setProperty('email_from_name', email_from_name, 'string')
>          p._setProperty('validate_email', validate_email and 1 or 0, 'boolean')
> +        p._setProperty('default_charset', '', 'string')
>          p.title = title
>          p.description = description
>  
> @@ -362,15 +362,15 @@
>                           create_userfolder=1,
>                           email_from_address='postmaster at localhost',
>                           email_from_name='Portal Administrator',
> -                         validate_email=0, RESPONSE=None):
> -    '''
> -    Adds a portal instance.
> -    '''
> +                         validate_email=0, default_charset='',
> +                         RESPONSE=None):
> +    """ Adds a portal instance.
> +    """
>      gen = PortalGenerator()
>      id = id.strip()
>      p = gen.create(self, id, create_userfolder)
>      gen.setupDefaultProperties(p, title, description,
>                                 email_from_address, email_from_name,
> -                               validate_email)
> +                               validate_email, default_charset)
>      if RESPONSE is not None:
>          RESPONSE.redirect(p.absolute_url() + '/finish_portal_construction')


-- 
Florent Guillaume, Nuxeo (Paris, France)   CTO, Director of R&D
+33 1 40 33 71 59   http://nuxeo.com   fg at nuxeo.com