summaryrefslogtreecommitdiff
path: root/python/helpers/pydev/pydev_ipython
diff options
context:
space:
mode:
Diffstat (limited to 'python/helpers/pydev/pydev_ipython')
-rw-r--r--python/helpers/pydev/pydev_ipython/inputhookglut.py3
-rw-r--r--python/helpers/pydev/pydev_ipython/inputhookpyglet.py3
-rw-r--r--python/helpers/pydev/pydev_ipython/inputhookqt4.py8
-rw-r--r--python/helpers/pydev/pydev_ipython/inputhookwx.py2
4 files changed, 10 insertions, 6 deletions
diff --git a/python/helpers/pydev/pydev_ipython/inputhookglut.py b/python/helpers/pydev/pydev_ipython/inputhookglut.py
index f0683ba5890e..e1e67e9930ed 100644
--- a/python/helpers/pydev/pydev_ipython/inputhookglut.py
+++ b/python/helpers/pydev/pydev_ipython/inputhookglut.py
@@ -29,9 +29,8 @@ GLUT Inputhook support functions
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
-import os
import sys
-import time
+from _pydev_imps import _pydev_time as time
import signal
import OpenGL.GLUT as glut
import OpenGL.platform as platform
diff --git a/python/helpers/pydev/pydev_ipython/inputhookpyglet.py b/python/helpers/pydev/pydev_ipython/inputhookpyglet.py
index 0cbb87f34b6d..64dd2e559545 100644
--- a/python/helpers/pydev/pydev_ipython/inputhookpyglet.py
+++ b/python/helpers/pydev/pydev_ipython/inputhookpyglet.py
@@ -20,9 +20,8 @@ Authors
# Imports
#-----------------------------------------------------------------------------
-import os
import sys
-import time
+from _pydev_imps import _pydev_time as time
from timeit import default_timer as clock
import pyglet
from pydev_ipython.inputhook import stdin_ready
diff --git a/python/helpers/pydev/pydev_ipython/inputhookqt4.py b/python/helpers/pydev/pydev_ipython/inputhookqt4.py
index f4f32a344e8a..27598fa742fe 100644
--- a/python/helpers/pydev/pydev_ipython/inputhookqt4.py
+++ b/python/helpers/pydev/pydev_ipython/inputhookqt4.py
@@ -18,7 +18,13 @@ Author: Christian Boos
import os
import signal
-import threading
+
+from pydevd_constants import USE_LIB_COPY
+if USE_LIB_COPY:
+ import _pydev_threading as threading
+else:
+ import threading
+
from pydev_ipython.qt_for_kernel import QtCore, QtGui
from pydev_ipython.inputhook import allow_CTRL_C, ignore_CTRL_C, stdin_ready
diff --git a/python/helpers/pydev/pydev_ipython/inputhookwx.py b/python/helpers/pydev/pydev_ipython/inputhookwx.py
index 6640884663ad..19ffdc72eff9 100644
--- a/python/helpers/pydev/pydev_ipython/inputhookwx.py
+++ b/python/helpers/pydev/pydev_ipython/inputhookwx.py
@@ -19,7 +19,7 @@ Authors: Robin Dunn, Brian Granger, Ondrej Certik
import sys
import signal
-import time
+from _pydev_imps import _pydev_time as time
from timeit import default_timer as clock
import wx