[Python-3000] UTF-32 codecs
walter at livinglogic.de
Thu Aug 16 23:32:17 CEST 2007
Martin v. Löwis wrote:
>> A simple merge won't work, because in 3.0 the codec uses bytes and in
>> 2.6 it uses str. Also the call to the decoding error handler has
>> changed, because in 3.0 the error handler could modify the mutable input
> So what's the strategy then? Block the trunk revision from merging?
I've never used svnmerge, so I don't know what the strategy for
automatic merging would be. What I would do is check in the patch for
the py3k branch, then apply the patch to the trunk, get it to work and
check it in.
More information about the Python-3000