Why do we have to switch everything at once? Both have the same interface, so I'd go for the same policy we're using to make everything PEP8-compatible: Be strict on new commits, and convert small pieces one at a time until we can remove the outdated exception.