summaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorTodd Leonhardt <todd.leonhardt@gmail.com>2019-06-15 10:53:06 -0400
committerGitHub <noreply@github.com>2019-06-15 10:53:06 -0400
commitc12ba0ff11b3a8fd083c641cb9149aff6494bbf9 (patch)
treea858864c091088e633de6ba6c8db55fd618a71e7 /tests/conftest.py
parentb3759991adca62779ef7aefbff9dc7004463e129 (diff)
parent6a122ae91b6a3fabc3709b1d488843715258e58c (diff)
downloadcmd2-git-c12ba0ff11b3a8fd083c641cb9149aff6494bbf9.tar.gz
Merge pull request #701 from python-cmd2/rename
Rename load, _relative_load, and pyscript
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 1e124219..d20d060a 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -28,8 +28,8 @@ except ImportError:
# Help text for base cmd2.Cmd application
BASE_HELP = """Documented commands (type help <topic>):
========================================
-alias help load py quit shell
-edit history macro pyscript set shortcuts
+alias help load py quit run_script shell
+edit history macro pyscript run_pyscript set shortcuts
""" # noqa: W291
BASE_HELP_VERBOSE = """
@@ -44,6 +44,8 @@ macro Manage macros
py Invoke Python command or shell
pyscript Run a Python script file inside the console
quit Exit this application
+run_pyscript Run a Python script file inside the console
+run_script Run commands in script file that is encoded as either ASCII or UTF-8 text
set Set a settable parameter or show current settings of parameters
shell Execute a command as if at the OS prompt
shortcuts List available shortcuts
@@ -89,8 +91,8 @@ formatting:
SHORTCUTS_TXT = """Shortcuts for other commands:
!: shell
?: help
-@: load
-@@: _relative_load
+@: run_script
+@@: _relative_run_script
"""
# Output from the show command with default settings