Skip to content

Commit 30dae89

Browse files
committed
Upgrade to prompt_toolkit 3.0 for meshcli
1 parent 7e8ad51 commit 30dae89

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

bluetooth_mesh/apps/meshcli.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@
3737
from docopt import DocoptExit, docopt
3838
from prompt_toolkit import PromptSession
3939
from prompt_toolkit.completion import Completer, Completion
40-
from prompt_toolkit.eventloop import use_asyncio_event_loop
40+
from prompt_toolkit import __version__ as ptk_version
41+
PTK3 = ptk_version.startswith('3.')
42+
if not PTK3:
43+
from prompt_toolkit.eventloop import use_asyncio_event_loop
4144
from prompt_toolkit.history import FileHistory
4245
from prompt_toolkit.patch_stdout import patch_stdout
4346

@@ -1631,7 +1634,10 @@ async def _run(self, commands):
16311634

16321635
for line in commands:
16331636
if line is None:
1634-
line = await self.session.prompt("{}> ".format(self.uuid), async_=True)
1637+
if PTK3:
1638+
line = await self.session.prompt_async("{}> ".format(self.uuid))
1639+
else:
1640+
line = await self.session.prompt("{}> ".format(self.uuid), async_=True)
16351641

16361642
if not line.strip():
16371643
continue
@@ -1700,7 +1706,8 @@ def main():
17001706
-h --help Show this help message and exit
17011707
--version Show version and exit
17021708
"""
1703-
use_asyncio_event_loop()
1709+
if not PTK3:
1710+
use_asyncio_event_loop()
17041711
arguments = docopt(doc, version="stat_checker 0.5")
17051712

17061713
logging.basicConfig(

0 commit comments

Comments
 (0)