summaryrefslogtreecommitdiff
path: root/Lib/test/test_threading.py
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2015-05-06 06:36:29 +0300
committerBerker Peksag <berker.peksag@gmail.com>2015-05-06 06:36:29 +0300
commitc4c59050c898afad23279edc89daf6c677ecdbf4 (patch)
tree2b6cf48c334616a2607c985abdac9d0912a7bb6a /Lib/test/test_threading.py
parent33507000c7fecbf71fa8ce125999fcd353a8bbb7 (diff)
parentce643913a9049953950918b214fb7cef40506be5 (diff)
downloadcpython-git-c4c59050c898afad23279edc89daf6c677ecdbf4.tar.gz
Merge heads.
Diffstat (limited to 'Lib/test/test_threading.py')
-rw-r--r--Lib/test/test_threading.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 4b75ea6778..ddafba24b1 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -4,7 +4,7 @@ Tests for the threading module.
import test.support
from test.support import verbose, strip_python_stderr, import_module, cpython_only
-from test.script_helper import assert_python_ok, assert_python_failure
+from test.support.script_helper import assert_python_ok, assert_python_failure
import random
import re