Merge branch 'master' into black

# Conflicts:
#	cmd2/__init__.py
#	cmd2/argparse_completer.py
#	cmd2/argparse_custom.py
#	cmd2/cmd2.py
#	cmd2/decorators.py
#	cmd2/exceptions.py
#	cmd2/utils.py
#	examples/arg_decorators.py
#	examples/argparse_completion.py
#	examples/modular_commands_main.py
#	tests/test_argparse_completer.py
#	tests/test_argparse_custom.py
#	tests/test_cmd2.py
#	tests/test_completion.py
#	tests/test_history.py

1 files changed, 2 insertions, 4 deletions

diff --git a/tests/test_history.py b/tests/test_history.py
index 98ae00b7..57bd0d7b 100755
--- a/tests/test_history.py
+++ b/tests/test_history.py
@@ -34,10 +34,8 @@ except ImportError:
 # readline tests
 #
 def test_readline_remove_history_item(base_app):
-    from cmd2.rl_utils import (
-        readline,
-    )
-
+    from cmd2.rl_utils import readline
+    readline.clear_history()
     assert readline.get_current_history_length() == 0
     readline.add_history('this is a test')
     assert readline.get_current_history_length() == 1