Removed ERROR: text from perror output

3 files changed, 21 insertions, 28 deletions

diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py
index fb1199c3..a513d0e7 100644
--- a/cmd2/cmd2.py
+++ b/cmd2/cmd2.py
@@ -624,7 +624,7 @@ class Cmd(cmd.Cmd):
         if isinstance(err, Exception):
             err_msg = "EXCEPTION of type '{}' occurred with message: '{}'\n".format(type(err).__name__, err)
         else:
-            err_msg = "ERROR: {}\n".format(err)
+            err_msg = "{}\n".format(err)
         err_msg = err_color + err_msg + Fore.RESET
         self.decolorized_write(sys.stderr, err_msg)
 
diff --git a/tests/test_argparse.py b/tests/test_argparse.py
index 29f0d232..7db35c71 100644
--- a/tests/test_argparse.py
+++ b/tests/test_argparse.py
@@ -123,7 +123,7 @@ def argparse_app():
 def test_invalid_syntax(argparse_app, capsys):
     run_cmd(argparse_app, 'speak "')
     out, err = capsys.readouterr()
-    assert err == "ERROR: Invalid syntax: No closing quotation\n"
+    assert err == "Invalid syntax: No closing quotation\n"
 
 def test_argparse_basic_command(argparse_app):
     out = run_cmd(argparse_app, 'say hello')
diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py
index b10322f1..57e1e90f 100644
--- a/tests/test_cmd2.py
+++ b/tests/test_cmd2.py
@@ -569,7 +569,6 @@ def test_load_with_binary_file(base_app, capsys, request):
     out, err = capsys.readouterr()
 
     # The load command requires non-empty scripts files
-    assert str(err).startswith("ERROR")
     assert "is not an ASCII or UTF-8 encoded text file" in str(err)
     assert base_app.cmdqueue == []
 
@@ -804,7 +803,7 @@ def test_pipe_to_shell_error(base_app, capsys):
     run_cmd(base_app, 'help | foobarbaz.this_does_not_exist')
     out, err = capsys.readouterr()
     assert not out
-    assert err.startswith("ERROR: Not piping because")
+    assert err.startswith("Not piping because")
 
 
 @pytest.mark.skipif(not clipboard.can_clip,
@@ -2337,16 +2336,16 @@ def test_colors_pouterr_always_tty(mocker, capsys):
     # if colors are on, the output should have some escape sequences in it
     assert len(out) > len('oopsie\n')
     assert 'oopsie' in out
-    assert len(err) > len('Error: oopsie\n')
-    assert 'ERROR: oopsie' in err
+    assert len(err) > len('oopsie\n')
+    assert 'oopsie' in err
 
     # but this one shouldn't
     app.onecmd_plus_hooks('echo oopsie')
     out, err = capsys.readouterr()
     assert out == 'oopsie\n'
     # errors always have colors
-    assert len(err) > len('Error: oopsie\n')
-    assert 'ERROR: oopsie' in err
+    assert len(err) > len('oopsie\n')
+    assert 'oopsie' in err
 
 def test_colors_pouterr_always_notty(mocker, capsys):
     app = ColorsApp()
@@ -2359,16 +2358,16 @@ def test_colors_pouterr_always_notty(mocker, capsys):
     # if colors are on, the output should have some escape sequences in it
     assert len(out) > len('oopsie\n')
     assert 'oopsie' in out
-    assert len(err) > len('Error: oopsie\n')
-    assert 'ERROR: oopsie' in err
+    assert len(err) > len('oopsie\n')
+    assert 'oopsie' in err
 
     # but this one shouldn't
     app.onecmd_plus_hooks('echo oopsie')
     out, err = capsys.readouterr()
     assert out == 'oopsie\n'
     # errors always have colors
-    assert len(err) > len('Error: oopsie\n')
-    assert 'ERROR: oopsie' in err
+    assert len(err) > len('oopsie\n')
+    assert 'oopsie' in err
 
 def test_colors_terminal_tty(mocker, capsys):
     app = ColorsApp()
@@ -2381,15 +2380,15 @@ def test_colors_terminal_tty(mocker, capsys):
     out, err = capsys.readouterr()
     assert len(out) > len('oopsie\n')
     assert 'oopsie' in out
-    assert len(err) > len('Error: oopsie\n')
-    assert 'ERROR: oopsie' in err
+    assert len(err) > len('oopsie\n')
+    assert 'oopsie' in err
 
     # but this one shouldn't
     app.onecmd_plus_hooks('echo oopsie')
     out, err = capsys.readouterr()
     assert out == 'oopsie\n'
-    assert len(err) > len('Error: oopsie\n')
-    assert 'ERROR: oopsie' in err
+    assert len(err) > len('oopsie\n')
+    assert 'oopsie' in err
 
 def test_colors_terminal_notty(mocker, capsys):
     app = ColorsApp()
@@ -2399,13 +2398,11 @@ def test_colors_terminal_notty(mocker, capsys):
 
     app.onecmd_plus_hooks('echo_error oopsie')
     out, err = capsys.readouterr()
-    assert out == 'oopsie\n'
-    assert err == 'ERROR: oopsie\n'
+    assert out == err == 'oopsie\n'
 
     app.onecmd_plus_hooks('echo oopsie')
     out, err = capsys.readouterr()
-    assert out == 'oopsie\n'
-    assert err == 'ERROR: oopsie\n'
+    assert out == err == 'oopsie\n'
 
 def test_colors_never_tty(mocker, capsys):
     app = ColorsApp()
@@ -2415,13 +2412,11 @@ def test_colors_never_tty(mocker, capsys):
 
     app.onecmd_plus_hooks('echo_error oopsie')
     out, err = capsys.readouterr()
-    assert out == 'oopsie\n'
-    assert err == 'ERROR: oopsie\n'
+    assert out == err == 'oopsie\n'
 
     app.onecmd_plus_hooks('echo oopsie')
     out, err = capsys.readouterr()
-    assert out == 'oopsie\n'
-    assert err == 'ERROR: oopsie\n'
+    assert out == err == 'oopsie\n'
 
 def test_colors_never_notty(mocker, capsys):
     app = ColorsApp()
@@ -2431,10 +2426,8 @@ def test_colors_never_notty(mocker, capsys):
 
     app.onecmd_plus_hooks('echo_error oopsie')
     out, err = capsys.readouterr()
-    assert out == 'oopsie\n'
-    assert err == 'ERROR: oopsie\n'
+    assert out == err == 'oopsie\n'
 
     app.onecmd_plus_hooks('echo oopsie')
     out, err = capsys.readouterr()
-    assert out == 'oopsie\n'
-    assert err == 'ERROR: oopsie\n'
+    assert out == err == 'oopsie\n'