|
4 | 4 | import asyncio |
5 | 5 | import base64 |
6 | 6 | import errno |
7 | | -from getpass import getpass |
8 | | -from io import BytesIO |
| 7 | +import inspect |
9 | 8 | import os |
10 | | -from queue import Empty |
11 | 9 | import signal |
12 | 10 | import subprocess |
13 | 11 | import sys |
14 | | -from tempfile import TemporaryDirectory |
15 | 12 | import time |
| 13 | +from getpass import getpass |
| 14 | +from io import BytesIO |
| 15 | +from queue import Empty |
| 16 | +from tempfile import TemporaryDirectory |
| 17 | +from typing import Any as AnyType |
| 18 | +from typing import Dict as DictType |
16 | 19 | from warnings import warn |
17 | 20 |
|
18 | | -from typing import Dict as DictType, Any as AnyType |
19 | | - |
20 | | -from zmq import ZMQError |
21 | 21 | from IPython.core import page |
22 | | -from traitlets import ( |
23 | | - Bool, |
24 | | - Integer, |
25 | | - Float, |
26 | | - Unicode, |
27 | | - List, |
28 | | - Dict, |
29 | | - Enum, |
30 | | - Instance, |
31 | | - Any, |
32 | | -) |
| 22 | + |
| 23 | +# Discriminate version3 for asyncio |
| 24 | +from prompt_toolkit import __version__ as ptk_version |
| 25 | +from traitlets import Any, Bool, Dict, Enum, Float, Instance, Integer, List, Unicode |
33 | 26 | from traitlets.config import SingletonConfigurable |
| 27 | +from zmq import ZMQError |
34 | 28 |
|
| 29 | +from . import __version__ |
35 | 30 | from .completer import ZMQCompleter |
36 | 31 | from .zmqhistory import ZMQHistoryManager |
37 | | -from . import __version__ |
38 | 32 |
|
39 | | -# Discriminate version3 for asyncio |
40 | | -from prompt_toolkit import __version__ as ptk_version |
41 | 33 | PTK3 = ptk_version.startswith('3.') |
42 | 34 |
|
43 | 35 | if not PTK3: |
|
49 | 41 | from prompt_toolkit.enums import DEFAULT_BUFFER, EditingMode |
50 | 42 | from prompt_toolkit.filters import ( |
51 | 43 | Condition, |
| 44 | + emacs_insert_mode, |
52 | 45 | has_focus, |
53 | 46 | has_selection, |
54 | | - vi_insert_mode, |
55 | | - emacs_insert_mode, |
56 | 47 | is_done, |
| 48 | + vi_insert_mode, |
57 | 49 | ) |
| 50 | +from prompt_toolkit.formatted_text import PygmentsTokens |
58 | 51 | from prompt_toolkit.history import InMemoryHistory |
59 | | -from prompt_toolkit.shortcuts.prompt import PromptSession |
60 | | -from prompt_toolkit.shortcuts import print_formatted_text, CompleteStyle |
61 | 52 | from prompt_toolkit.key_binding import KeyBindings |
62 | | -from prompt_toolkit.lexers import PygmentsLexer |
63 | 53 | from prompt_toolkit.layout.processors import ( |
64 | 54 | ConditionalProcessor, |
65 | 55 | HighlightMatchingBracketProcessor, |
66 | 56 | ) |
| 57 | +from prompt_toolkit.lexers import PygmentsLexer |
| 58 | +from prompt_toolkit.output import ColorDepth |
| 59 | +from prompt_toolkit.shortcuts import CompleteStyle, print_formatted_text |
| 60 | +from prompt_toolkit.shortcuts.prompt import PromptSession |
67 | 61 | from prompt_toolkit.styles import merge_styles |
68 | 62 | from prompt_toolkit.styles.pygments import (style_from_pygments_cls, |
69 | 63 | style_from_pygments_dict) |
70 | | -from prompt_toolkit.formatted_text import PygmentsTokens |
71 | | -from prompt_toolkit.output import ColorDepth |
72 | 64 | from prompt_toolkit.utils import suspend_to_background_supported |
73 | | - |
74 | | -from pygments.styles import get_style_by_name |
75 | 65 | from pygments.lexers import get_lexer_by_name |
76 | | -from pygments.util import ClassNotFound |
| 66 | +from pygments.styles import get_style_by_name |
77 | 67 | from pygments.token import Token |
| 68 | +from pygments.util import ClassNotFound |
78 | 69 |
|
79 | | -from jupyter_console.utils import run_sync, ensure_async |
| 70 | +from jupyter_console.utils import ensure_async, run_sync |
80 | 71 |
|
81 | 72 |
|
82 | 73 | def ask_yes_no(prompt, default=None, interrupt=None): |
@@ -329,6 +320,7 @@ class ZMQTerminalInteractiveShell(SingletonConfigurable): |
329 | 320 | client = Instance("jupyter_client.KernelClient", allow_none=True) |
330 | 321 |
|
331 | 322 | def _client_changed(self, name, old, new): |
| 323 | + assert inspect.iscoroutinefunction(new.shell_channel.get_msg), new.shell_channel |
332 | 324 | self.session_id = new.session.session |
333 | 325 | session_id = Unicode() |
334 | 326 |
|
|
0 commit comments