Created attachment 15188 [details]
patch that probably works
This affects 4.10, which means we need a back-portable patch, not a simple py3 only patch.
Created attachment 15197 [details]
patch that actually works, which we know because it has tests
At least it works in py3, and SHOULD work in py2.
Created attachment 15204 [details]
patch for 4.10
The 4.10 patch is cherry-picked from master, with BUG: lines added to the message.
We should put this in the next 4.10.
4.9 and earlier are not affected because they don't support Python 3.
Pushed to autobuild-v4-10-test.
Pushed to v4-10-test.