Fix two RC bugs

Nicholas D Steevesrequested to merge
sten/yapf:master into master

Hi @ana-guest

This PR closes #904755 and #906789. I decided to submit a PR rather than a patch, since I noticed that the Python Team git repo hadn't been updated for -5, and I hope that this is more convenient for you :-)

I added 2a7b56ed while testing to see why autopkgtests weren't catching those two bugs. Keeping it is probably a matter of taste, but I feel that it is beneficial for custom tests to be a superset of autopkgtest-pkg-python.

Merge request reports