diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /python/helpers/pydev/pydev_ipython/inputhookpyglet.py | |
parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'python/helpers/pydev/pydev_ipython/inputhookpyglet.py')
-rw-r--r-- | python/helpers/pydev/pydev_ipython/inputhookpyglet.py | 3 |
1 files changed, 1 insertions, 2 deletions
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 |