From: Martin Panter <vadmium+py@gmail.com>
Date: Thu, 20 Oct 2016 22:36:18 +0000 (+0000)
Subject: Merge test suite fixes from 3.6
X-Git-Tag: v3.7.0a1~2183
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea8762cae64813788633b7d2a93c2c513c01fdea;p=python

Merge test suite fixes from 3.6
---

ea8762cae64813788633b7d2a93c2c513c01fdea