[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/c670249c7956
changeset:   94468:c670249c7956
parent:      94465:42b376c8cf60
parent:      94467:70966f32793d
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Feb 02 14:06:29 2015 -0500
summary:
  merge 3.4

files:
  Lib/test/test_sys.py |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -539,6 +539,7 @@
         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()
 

-- 
Repository URL: https://hg.python.org/cpython