Merge pull request #758 from python-cmd2/empty_script_ok

No longer treating empty text scripts as an error condition

3 files changed, 6 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce18aacc..6d6a7d12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.17 (TBD, 2019)
+* Enhancements
+    * No longer treating empty text scripts as an error condition
+
 ## 0.9.16 (August 7, 2019)
 * Bug Fixes
     * Fixed inconsistent parsing/tab completion behavior based on the value of `allow_redirection`. This flag is
diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py
index a0df0b00..9d29418b 100755
--- a/cmd2/cmd2.py
+++ b/cmd2/cmd2.py
@@ -3790,9 +3790,8 @@ class Cmd(cmd.Cmd):
             self.perror("'{}' is not a file".format(expanded_path))
             return
 
-        # Make sure the file is not empty
+        # An empty file is not an error, so just return
         if os.path.getsize(expanded_path) == 0:
-            self.perror("'{}' is empty".format(expanded_path))
             return
 
         # Make sure the file is ASCII or UTF-8 encoded text
diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py
index a856c1d6..313b4dee 100755
--- a/tests/test_cmd2.py
+++ b/tests/test_cmd2.py
@@ -318,7 +318,7 @@ def test_run_script_with_empty_file(base_app, request):
     test_dir = os.path.dirname(request.module.__file__)
     filename = os.path.join(test_dir, 'scripts', 'empty.txt')
     out, err = run_cmd(base_app, 'run_script {}'.format(filename))
-    assert "is empty" in err[0]
+    assert not out and not err
 
 def test_run_script_with_binary_file(base_app, request):
     test_dir = os.path.dirname(request.module.__file__)