My point about Python 2 was that this might add an annoying difference between the two branches. Even if you don’t apply this to Py 2, the next person adding or updating a test might be inclined to do it.

Looking closer at your patch I admit that addCleanup() wouldn’t be appropriate except for the first change.

Maybe it would be okay to leave the “try / finally” cases as they are? Moving connect() inside is good though IMO.

Anyway, I’m only mildly against this. I don’t see much benefit, but I could tolerate the downsides. I guess it’s up to you.