summaryrefslogtreecommitdiff
path: root/cmd2.py
diff options
context:
space:
mode:
Diffstat (limited to 'cmd2.py')
-rwxr-xr-xcmd2.py12
1 files changed, 9 insertions, 3 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')