From b9c2d89a5a085873bf03329f7639c6c1ff6d518e Mon Sep 17 00:00:00 2001 From: n9k Date: Sun, 31 Jul 2022 23:09:52 +0000 Subject: [PATCH] Control socket: rename method 'exit' -> 'quit' --- anonstream/control/parse.py | 4 ++-- anonstream/control/spec/methods/help.py | 2 +- .../control/spec/methods/{exit.py => quit.py} | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) rename anonstream/control/spec/methods/{exit.py => quit.py} (62%) diff --git a/anonstream/control/parse.py b/anonstream/control/parse.py index a567c6d..de30db3 100644 --- a/anonstream/control/parse.py +++ b/anonstream/control/parse.py @@ -5,14 +5,14 @@ from anonstream.control.spec import ParseException, Parsed from anonstream.control.spec.common import Str from anonstream.control.spec.methods.allowedness import SPEC as SPEC_ALLOWEDNESS from anonstream.control.spec.methods.chat import SPEC as SPEC_CHAT -from anonstream.control.spec.methods.exit import SPEC as SPEC_EXIT from anonstream.control.spec.methods.help import SPEC as SPEC_HELP +from anonstream.control.spec.methods.quit import SPEC as SPEC_QUIT from anonstream.control.spec.methods.title import SPEC as SPEC_TITLE from anonstream.control.spec.methods.user import SPEC as SPEC_USER SPEC = Str({ 'help': SPEC_HELP, - 'exit': SPEC_EXIT, + 'quit': SPEC_QUIT, 'title': SPEC_TITLE, 'chat': SPEC_CHAT, 'user': SPEC_USER, diff --git a/anonstream/control/spec/methods/help.py b/anonstream/control/spec/methods/help.py index 8a5399f..ab0e5c7 100644 --- a/anonstream/control/spec/methods/help.py +++ b/anonstream/control/spec/methods/help.py @@ -9,7 +9,7 @@ async def cmd_help(): 'Usage: METHOD [COMMAND | help]\n' 'Examples:\n' ' help...........................show this help message\n' - ' exit...........................close the control connection\n' + ' quit...........................close the control connection\n' ' title [show]...................show the stream title\n' ' title set TITLE................set the stream title\n' ' user [show]....................show a list of users\n' diff --git a/anonstream/control/spec/methods/exit.py b/anonstream/control/spec/methods/quit.py similarity index 62% rename from anonstream/control/spec/methods/exit.py rename to anonstream/control/spec/methods/quit.py index 101f104..1f7651b 100644 --- a/anonstream/control/spec/methods/exit.py +++ b/anonstream/control/spec/methods/quit.py @@ -4,19 +4,19 @@ from anonstream.control.spec.common import Str, End from anonstream.control.exceptions import ControlSocketExit -async def cmd_exit(): +async def cmd_quit(): raise ControlSocketExit -async def cmd_exit_help(): - normal = ['exit', 'help'] +async def cmd_quit_help(): + normal = ['quit', 'help'] response = ( - 'Usage: exit\n' + 'Usage: quit\n' 'Commands:\n' - ' exit......close the connection\n' + ' quit......close the connection\n' ) return normal, response SPEC = Str({ - None: End(cmd_exit), - 'help': End(cmd_exit_help), + None: End(cmd_quit), + 'help': End(cmd_quit_help), })