Per the discussion in issue6882, backport the try/finally work that was done to the py3k version (mostly in r59477, I think).