Skip to content

remove deprecated arguments to prompt() #993

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

Merged
merged 6 commits into from
Jul 5, 2018
Merged

remove deprecated arguments to prompt() #993

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
294bcba
prompt-toolkit has been updated many times since slcli-shell was crea…
ScottieD Jul 5, 2018
1f44e7d
resolve pep E303
ScottieD Jul 5, 2018
fea967b
removed unused variable.
ScottieD Jul 5, 2018
227766e
removed unused variables.
ScottieD Jul 5, 2018
7b5080e
removed get_prompt_tokens.
ScottieD Jul 5, 2018
1a46b24
removed pygments import.
ScottieD Jul 5, 2018
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
23 changes: 1 addition & 22 deletions SoftLayer/shell/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@

import click
from prompt_toolkit import auto_suggest as p_auto_suggest
from prompt_toolkit import history as p_history
from prompt_toolkit import shortcuts as p_shortcuts
from pygments import token

from SoftLayer.CLI import core
from SoftLayer.CLI import environment
Expand Down Expand Up @@ -49,33 +47,14 @@ def cli(ctx, env):
app_path = click.get_app_dir('softlayer_shell')
if not os.path.exists(app_path):
os.makedirs(app_path)
history = p_history.FileHistory(os.path.join(app_path, 'history'))
complete = completer.ShellCompleter(core.cli)

while True:
def get_prompt_tokens(_):
"""Returns tokens for the command prompt"""
tokens = []
try:
tokens.append((token.Token.Username, env.client.auth.username))
tokens.append((token.Token.At, "@"))
except AttributeError:
pass

tokens.append((token.Token.Host, "slcli-shell"))
if env.vars['last_exit_code']:
tokens.append((token.Token.ErrorPrompt, '> '))
else:
tokens.append((token.Token.Prompt, '> '))

return tokens

try:
line = p_shortcuts.prompt(
completer=complete,
history=history,
complete_while_typing=True,
auto_suggest=p_auto_suggest.AutoSuggestFromHistory(),
get_prompt_tokens=get_prompt_tokens,
)

# Parse arguments
Expand Down