merge 3.4

Author: benjaminp

Lib/test/test_sys.py

@@ -539,7 +539,7 @@ def test_sys_getwindowsversion_no_instantiation(self):
         test.support.get_attribute(sys, "getwindowsversion")
         self.assert_raise_on_new_sys_type(sys.getwindowsversion())
 
-    @test.test_support.cpython_only
+    @test.support.cpython_only
     def test_clear_type_cache(self):
         sys._clear_type_cache()