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

[xavier.degaye]

https://hg.python.org/cpython/rev/e401c5a95758
changeset:   105525:e401c5a95758
parent:      105523:c5d7e46926ac
parent:      105524:1bb2f4b8440e
user:        Xavier de Gaye <xdegaye at users.sourceforge.net>
date:        Thu Dec 08 11:27:27 2016 +0100
summary:
  Issue #26940: Merge 3.6.

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


diff --git a/Lib/test/test_importlib/test_locks.py b/Lib/test/test_importlib/test_locks.py
--- a/Lib/test/test_importlib/test_locks.py
+++ b/Lib/test/test_importlib/test_locks.py
@@ -57,7 +57,7 @@
         def setUp(self):
             try:
                 self.old_switchinterval = sys.getswitchinterval()
-                sys.setswitchinterval(0.000001)
+                support.setswitchinterval(0.000001)
             except AttributeError:
                 self.old_switchinterval = None
 

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