Merge 3.3 into default.

Issue 18944:  fix a 1-character typo in test_set.py.

The error caused test_inline_methods() to test much less than intended.
Caught (& fixed) by Armin Rigo.