19 files changed, 5 insertions, 23 deletions
diff --git a/cmd2/pyscript_bridge.py b/cmd2/pyscript_bridge.py
index b66fd701..9d865b6b 100644
--- a/cmd2/pyscript_bridge.py
+++ b/cmd2/pyscript_bridge.py
@@ -247,7 +247,7 @@ class PyscriptBridge(object):
     def __init__(self, cmd2_app):
         self._cmd2_app = cmd2_app
         self._last_result = None
-        self.cmd_echo = False
+        self.cmd_echo = True
 
     def __getattr__(self, item: str):
         """
@@ -271,10 +271,10 @@ class PyscriptBridge(object):
             raise AttributeError("'{}' object has no attribute '{}'".format(self._cmd2_app.pyscript_name, item))
 
     def __dir__(self):
-        """Return a custom set of attribute names to match the available commands"""
-        commands = list(self._cmd2_app.get_all_commands())
-        commands.insert(0, 'cmd_echo')
-        return commands
+        """Return a custom set of attribute names"""
+        attributes = self._cmd2_app.get_all_commands()
+        attributes.insert(0, 'cmd_echo')
+        return attributes
 
     def __call__(self, args: str, echo: Optional[bool]=None) -> CommandResult:
         """
diff --git a/tests/pyscript/bar1.py b/tests/pyscript/bar1.py
index 521e2c29..c6276a87 100644
--- a/tests/pyscript/bar1.py
+++ b/tests/pyscript/bar1.py
@@ -1,2 +1 @@
-app.cmd_echo = True
 app.bar('11', '22')
diff --git a/tests/pyscript/custom_echo.py b/tests/pyscript/custom_echo.py
index 14040e4c..82a0f5e5 100644
--- a/tests/pyscript/custom_echo.py
+++ b/tests/pyscript/custom_echo.py
@@ -1,2 +1 @@
-custom.cmd_echo = True
 custom.echo('blah!')
diff --git a/tests/pyscript/foo1.py b/tests/pyscript/foo1.py
index d9345354..6e345d95 100644
--- a/tests/pyscript/foo1.py
+++ b/tests/pyscript/foo1.py
@@ -1,2 +1 @@
-app.cmd_echo = True
 app.foo('aaa', 'bbb', counter=3, trueval=True, constval=True)
diff --git a/tests/pyscript/foo2.py b/tests/pyscript/foo2.py
index d3600a60..d4df7616 100644
--- a/tests/pyscript/foo2.py
+++ b/tests/pyscript/foo2.py
@@ -1,2 +1 @@
-app.cmd_echo = True
 app.foo('11', '22', '33', '44', counter=3, trueval=True, constval=True)
diff --git a/tests/pyscript/foo3.py b/tests/pyscript/foo3.py
index fc0e084a..db69edaf 100644
--- a/tests/pyscript/foo3.py
+++ b/tests/pyscript/foo3.py
@@ -1,2 +1 @@
-app.cmd_echo = True
 app.foo('11', '22', '33', '44', '55', '66', counter=3, trueval=False, constval=False)
diff --git a/tests/pyscript/foo4.py b/tests/pyscript/foo4.py
index e4b7d01c..88fd3ce8 100644
--- a/tests/pyscript/foo4.py
+++ b/tests/pyscript/foo4.py
@@ -1,4 +1,3 @@
-app.cmd_echo = True
 result = app.foo('aaa', 'bbb', counter=3)
 out_text = 'Fail'
 if result:
diff --git a/tests/pyscript/help.py b/tests/pyscript/help.py
index 664c0488..03fa3fe3 100644
--- a/tests/pyscript/help.py
+++ b/tests/pyscript/help.py
@@ -1,2 +1 @@
-app.cmd_echo = True
 app.help()
diff --git a/tests/pyscript/help_media.py b/tests/pyscript/help_media.py
index d8d97c42..78025bdd 100644
--- a/tests/pyscript/help_media.py
+++ b/tests/pyscript/help_media.py
@@ -1,2 +1 @@
-app.cmd_echo = True
 app.help('media')
diff --git a/tests/pyscript/media_movies_add1.py b/tests/pyscript/media_movies_add1.py
index 7249c0ef..a9139cb1 100644
--- a/tests/pyscript/media_movies_add1.py
+++ b/tests/pyscript/media_movies_add1.py
@@ -1,2 +1 @@
-app.cmd_echo = True
 app.media.movies.add('My Movie', 'PG-13', director=('George Lucas', 'J. J. Abrams'))
diff --git a/tests/pyscript/media_movies_add2.py b/tests/pyscript/media_movies_add2.py
index 681095d7..5c4617ae 100644
--- a/tests/pyscript/media_movies_add2.py
+++ b/tests/pyscript/media_movies_add2.py
@@ -1,2 +1 @@
-app.cmd_echo = True
 app.media.movies.add('My Movie', 'PG-13', actor=('Mark Hamill'), director=('George Lucas', 'J. J. Abrams'))
diff --git a/tests/pyscript/media_movies_list1.py b/tests/pyscript/media_movies_list1.py
index edbc2021..3503f9a1 100644
--- a/tests/pyscript/media_movies_list1.py
+++ b/tests/pyscript/media_movies_list1.py
@@ -1,2 +1 @@
-app.cmd_echo = True
 app.media.movies.list()
diff --git a/tests/pyscript/media_movies_list2.py b/tests/pyscript/media_movies_list2.py
index 5ad01b7b..95dcd797 100644
--- a/tests/pyscript/media_movies_list2.py
+++ b/tests/pyscript/media_movies_list2.py
@@ -1,2 +1 @@
-app.cmd_echo = True
 app.media().movies().list()
diff --git a/tests/pyscript/media_movies_list3.py b/tests/pyscript/media_movies_list3.py
index bdbdfceb..7104ae59 100644
--- a/tests/pyscript/media_movies_list3.py
+++ b/tests/pyscript/media_movies_list3.py
@@ -1,2 +1 @@
-app.cmd_echo = True
 app('media movies list')
diff --git a/tests/pyscript/media_movies_list4.py b/tests/pyscript/media_movies_list4.py
index 5f7bdaa9..1165b0c5 100644
--- a/tests/pyscript/media_movies_list4.py
+++ b/tests/pyscript/media_movies_list4.py
@@ -1,2 +1 @@
-app.cmd_echo = True
 app.media.movies.list(actor='Mark Hamill')
diff --git a/tests/pyscript/media_movies_list5.py b/tests/pyscript/media_movies_list5.py
index fa4efa5b..962b1516 100644
--- a/tests/pyscript/media_movies_list5.py
+++ b/tests/pyscript/media_movies_list5.py
@@ -1,2 +1 @@
-app.cmd_echo = True
 app.media.movies.list(actor=('Mark Hamill', 'Carrie Fisher'))
diff --git a/tests/pyscript/media_movies_list6.py b/tests/pyscript/media_movies_list6.py
index ef1851cd..5f8d3654 100644
--- a/tests/pyscript/media_movies_list6.py
+++ b/tests/pyscript/media_movies_list6.py
@@ -1,2 +1 @@
-app.cmd_echo = True
 app.media.movies.list(rating='PG')
diff --git a/tests/pyscript/media_movies_list7.py b/tests/pyscript/media_movies_list7.py
index 7c827b7f..bb0e28bb 100644
--- a/tests/pyscript/media_movies_list7.py
+++ b/tests/pyscript/media_movies_list7.py
@@ -1,2 +1 @@
-app.cmd_echo = True
 app.media.movies.list(rating=('PG', 'PG-13'))
diff --git a/tests/scripts/recursive.py b/tests/scripts/recursive.py
index 4c29d317..32c981b6 100644
--- a/tests/scripts/recursive.py
+++ b/tests/scripts/recursive.py
@@ -3,5 +3,4 @@
 """
 Example demonstrating that running a Python script recursively inside another Python script isn't allowed
 """
-app.cmd_echo = True
 app('pyscript ../script.py')