merge heads
#11420: make test suite pass with -B/DONTWRITEBYTECODE set.  Initial patch by Thomas Wouters.
#11420: make test suite pass with -B/DONTWRITEBYTECODE set.  Initial patch by Thomas Wouters.
#11420: merge with 3.2.
Issue #17418: specify that buffer sizes are bytes.
Issue #17418: specify that buffer sizes are bytes as soon as possible.
Merge with 3.2
Merge heads.
Merge heads 3.2.
Merge heads 3.3.
Null merge
Issue #16564: Fixed a performance regression relative to Python 3.1 in the
caching of compiled regular expressions.
Issue #16564: Fixed a performance regression relative to Python 3.1 in the
caching of compiled regular expressions.
Issue #16389: Fixed an issue number in previos commit.
Issue #16389: Fixed an issue number in previos commit.
Issue #17415: Clarify 'this' referent by moving containing sentence just after
the sentence referred to. Make other minor edits to improve flow.
Issue #17415: Clarify 'this' referent by moving containing sentence just after
the sentence referred to. Make other minor edits to improve flow.
Merge with 3.2
Issue #17415: Trim trailing whitespace
Issue #17415: Trim trailing whitespace