Comment 6 for bug 142874

I have applied the patch:

Zope 2.12 branch: http://svn.zope.org/?rev=112683&view=rev

Zope trunk: http://svn.zope.org/?rev=112684&view=rev

As noted in the comments there may be other places where this failure still occurs, but those should be dealt with using separate Launchpad issues that describe exactly what's failing where.