Skip to content

Support to prompt_toolkit 3.0 on meshcli #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tot0rokr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support to prompt_toolkit 3.0 on meshcli #160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions bluetooth_mesh/apps/meshcli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,13 @@

from docopt import DocoptExit, docopt
from prompt_toolkit import PromptSession
from prompt_toolkit import __version__ as ptk_version
from prompt_toolkit.completion import Completer, Completion
from prompt_toolkit.eventloop import use_asyncio_event_loop

PTK3 = ptk_version.startswith("3.")
if not PTK3:
from prompt_toolkit.eventloop import use_asyncio_event_loop

from prompt_toolkit.history import FileHistory
from prompt_toolkit.patch_stdout import patch_stdout

Expand Down Expand Up @@ -1631,7 +1636,12 @@ async def _run(self, commands):

for line in commands:
if line is None:
line = await self.session.prompt("{}> ".format(self.uuid), async_=True)
if PTK3:
line = await self.session.prompt_async("{}> ".format(self.uuid))
else:
line = await self.session.prompt(
"{}> ".format(self.uuid), async_=True
)

if not line.strip():
continue
Expand Down Expand Up @@ -1700,7 +1710,8 @@ def main():
-h --help Show this help message and exit
--version Show version and exit
"""
use_asyncio_event_loop()
if not PTK3:
use_asyncio_event_loop()
arguments = docopt(doc, version="stat_checker 0.5")

logging.basicConfig(
Expand Down