summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Leonhardt <todd.leonhardt@gmail.com>2017-07-08 11:36:48 -0400
committerTodd Leonhardt <todd.leonhardt@gmail.com>2017-07-08 11:36:48 -0400
commit400b8317c21600fe68c0ac4c98449f73a64ac309 (patch)
treeacaf7c79a059e1037ebb117a0df4e976e56723ea
parentce8da647908a984950fb3b329d2bdd98a99b09e2 (diff)
downloadcmd2-git-400b8317c21600fe68c0ac4c98449f73a64ac309.tar.gz
Load command uses utf-8 encoding for opening files in Python 3 instead of OS-default
This fixes a unit test bug where on Windows it was trying to load a utf-8 file as some other encoding starting with "cp".
-rwxr-xr-xcmd2.py12
-rw-r--r--docs/freefeatures.rst10
2 files changed, 17 insertions, 5 deletions
diff --git a/cmd2.py b/cmd2.py
index b7a6151a..c83a9bf0 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -1659,9 +1659,15 @@ Script should contain one command per line, just like command would be typed in
return
try:
- # Add all commands in the script to the command queue
- with open(expanded_path) as target:
- self.cmdqueue.extend(target.read().splitlines())
+ # Specify file encoding in Python 3, but Python 2 doesn't allow that argument to open()
+ if six.PY3:
+ # Add all commands in the script to the command queue
+ with open(expanded_path, encoding='utf-8') as target:
+ self.cmdqueue.extend(target.read().splitlines())
+ else:
+ # Add all commands in the script to the command queue
+ with open(expanded_path) as target:
+ self.cmdqueue.extend(target.read().splitlines())
# Append in an "end of script (eos)" command to cleanup the self._script_dir list
self.cmdqueue.append('eos')
diff --git a/docs/freefeatures.rst b/docs/freefeatures.rst
index 7381ff8e..1c829f0a 100644
--- a/docs/freefeatures.rst
+++ b/docs/freefeatures.rst
@@ -13,15 +13,21 @@ Script files
============
Text files can serve as scripts for your ``cmd2``-based
-application, with the ``load``, ``save``, and ``edit``
-commands.
+application, with the ``load``, ``_relative_load``, ``save``, and ``edit`` commands.
+
+Both ASCII and UTF-8 encoded unicode text files are supported.
+
+Simply include one command per line, typed exactly as you would inside a ``cmd2`` application.
.. automethod:: cmd2.Cmd.do_load
+.. automethod:: cmd2.Cmd.do__relative_load
+
.. automethod:: cmd2.Cmd.do_save
.. automethod:: cmd2.Cmd.do_edit
+
Comments
========