merge 3.4

This commit is contained in:
Benjamin Peterson 2015-02-02 14:06:29 -05:00
commit 5e69419ee4

View file

@ -539,6 +539,7 @@ class SysModuleTest(unittest.TestCase):
test.support.get_attribute(sys, "getwindowsversion")
self.assert_raise_on_new_sys_type(sys.getwindowsversion())
@test.test_support.cpython_only
def test_clear_type_cache(self):
sys._clear_type_cache()