Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
Griatch 2021-01-18 21:35:48 +01:00
commit d88431b8d3
5 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
evennia/utils/eveditor.py
View file

@ -43,7 +43,7 @@ import re
from django.conf import settings
from evennia import Command, CmdSet
from evennia.utils import is_iter, fill, dedent, logger, justify, to_str
from evennia.utils import is_iter, fill, dedent, logger, justify, to_str, utils
from evennia.utils.ansi import raw
from evennia.commands import cmdhandler
@ -53,6 +53,7 @@ _CMD_NOMATCH = cmdhandler.CMD_NOMATCH
_CMD_NOINPUT = cmdhandler.CMD_NOINPUT
_RE_GROUP = re.compile(r"\".*?\"|\'.*?\'|\S*")
_COMMAND_DEFAULT_CLASS = utils.class_from_module(settings.COMMAND_DEFAULT_CLASS)
# use NAWS in the future?
_DEFAULT_WIDTH = settings.CLIENT_DEFAULT_WIDTH
@ -166,7 +167,7 @@ _MSG_REDO = "Redid one step."
# -------------------------------------------------------------
class CmdSaveYesNo(Command):
class CmdSaveYesNo(_COMMAND_DEFAULT_CLASS):
"""
Save the editor state on quit. This catches
nomatches (defaults to Yes), and avoid saves only if
@ -212,7 +213,7 @@ class SaveYesNoCmdSet(CmdSet):
# -------------------------------------------------------------
class CmdEditorBase(Command):
class CmdEditorBase(_COMMAND_DEFAULT_CLASS):
"""
Base parent for editor commands
"""