[Python-checkins] cpython (merge 3.6 -> default): Issue #26941: Merge 3.6.

[xavier.degaye]

https://hg.python.org/cpython/rev/8688a664995c
changeset:   105527:8688a664995c
parent:      105525:e401c5a95758
parent:      105526:b64ba5604e48
user:        Xavier de Gaye <xdegaye at users.sourceforge.net>
date:        Thu Dec 08 12:21:53 2016 +0100
summary:
  Issue #26941: Merge 3.6.

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


diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -462,7 +462,7 @@
         self.addCleanup(sys.setswitchinterval, old_interval)
 
         # Make the bug more likely to manifest.
-        sys.setswitchinterval(1e-6)
+        test.support.setswitchinterval(1e-6)
 
         for i in range(20):
             t = threading.Thread(target=lambda: None)

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