[MERGE] Re: [patch] small user_encoding fix

[Wouter van Heyst]

On Fri, Mar 03, 2006 at 02:45:35PM +0100, Wouter van Heyst wrote:
> On Tue, Feb 21, 2006 at 10:27:11AM +1100, Robert Collins wrote:
> > On Mon, 2006-02-20 at 17:06 +0100, Marien Zwart wrote:
> > > 
> > > -user_encoding = locale.getpreferredencoding() or 'ascii'
> > > +try:
> > > +    user_encoding = locale.getpreferredencoding() or 'ascii'
> > > +except locale.Error:
> > > +    user_encoding = 'ascii'
> > >  del locale 
> > 
> > Its not -quite- trivial... 
> > 
> > So to test this I would do the following: 
> >  * make the code in question a function to allow it to be invoked at
> > other times than the system startup:
> 
> <snip>
> 
> What needs to be done to finish this? With my upgrade to dapper breaking
> my locales, this now always happens to me unless I force to C.

Robert's code looked good to me, and the fix solves my problem.
Branch is located at http://bzr.richtlijn.be/bzr.lq/

 1565 Wouter van Heyst  2006-03-03
       Implement locale.Error test and handling by Marien Zwart and
       Robert Collins

Wouter van Heyst