diff options
| author | kotfu <kotfu@kotfu.net> | 2020-02-20 20:36:33 -0700 |
|---|---|---|
| committer | kotfu <kotfu@kotfu.net> | 2020-02-20 20:36:33 -0700 |
| commit | f0c3cbffa35dfe26b8ac54ea1450ed50ba787c9a (patch) | |
| tree | 03b0e85aaaccc0706caf5658446dda0a5a13cd9f /docs | |
| parent | 1e57b0c451de23338378f44088118648848cc82c (diff) | |
| parent | 22de85832e877b5b360eeacd4b71e00f69bf00e1 (diff) | |
| download | cmd2-git-f0c3cbffa35dfe26b8ac54ea1450ed50ba787c9a.tar.gz | |
Merge branch 'master' into api_docs
# Conflicts:
# CHANGELOG.md
# cmd2/__init__.py
# cmd2/decorators.py
# docs/api/utility_functions.rst
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api/exceptions.rst | 4 | ||||
| -rw-r--r-- | docs/api/index.rst | 1 | ||||
| -rw-r--r-- | docs/features/hooks.rst | 7 |
3 files changed, 1 insertions, 11 deletions
diff --git a/docs/api/exceptions.rst b/docs/api/exceptions.rst deleted file mode 100644 index 400993aa..00000000 --- a/docs/api/exceptions.rst +++ /dev/null @@ -1,4 +0,0 @@ -Exceptions -========== - -.. autoexception:: cmd2.EmptyStatement diff --git a/docs/api/index.rst b/docs/api/index.rst index 864b8290..fea39f72 100644 --- a/docs/api/index.rst +++ b/docs/api/index.rst @@ -7,7 +7,6 @@ API Reference cmd parsing decorators - exceptions ansi utils constants diff --git a/docs/features/hooks.rst b/docs/features/hooks.rst index ee1d5fbc..ba9af573 100644 --- a/docs/features/hooks.rst +++ b/docs/features/hooks.rst @@ -102,12 +102,7 @@ called each time it was registered. Postparsing, precommand, and postcommand hook methods share some common ways to influence the command processing loop. -If a hook raises a ``cmd2.EmptyStatement`` exception: -- no more hooks (except command finalization hooks) of any kind will be called -- if the command has not yet been executed, it will not be executed -- no error message will be displayed to the user - -If a hook raises any other exception: +If a hook raises an exception: - no more hooks (except command finalization hooks) of any kind will be called - if the command has not yet been executed, it will not be executed - the exception message will be displayed for the user. |
