Fix various test failures with Python 3.11#328

jelmer merged 1 commit intotesting-cabal:mastertesting-cabal/testtools:masterfrom

cjwatson:py311cjwatson/testtools:py311Copy head branch name to clipboard