diff options
| author | Todd Leonhardt <todd.leonhardt@gmail.com> | 2018-06-27 06:05:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-27 06:05:59 -0700 |
| commit | 842788675e9c4f0d416626ea3d8a9dac5e00b595 (patch) | |
| tree | 15c42850f2d624ed60565876d20889ca8b7cf8ff /examples/python_scripting.py | |
| parent | f0c98ac10e60995bbf2dff9848931109cac2f96e (diff) | |
| parent | 3c8880e40bf653e098577de94be7eb2171dbc6b4 (diff) | |
| download | cmd2-git-842788675e9c4f0d416626ea3d8a9dac5e00b595.tar.gz | |
Merge branch 'master' into autocompleter
Diffstat (limited to 'examples/python_scripting.py')
| -rwxr-xr-x | examples/python_scripting.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/examples/python_scripting.py b/examples/python_scripting.py index fd2d7e8f..069bcff5 100755 --- a/examples/python_scripting.py +++ b/examples/python_scripting.py @@ -56,7 +56,7 @@ class CmdLineApp(cmd2.Cmd): if not arglist or len(arglist) != 1: self.perror("cd requires exactly 1 argument:", traceback_war=False) self.do_help('cd') - self._last_result = cmd2.CmdResult('', 'Bad arguments') + self._last_result = cmd2.CommandResult('', 'Bad arguments') return # Convert relative paths to absolute paths @@ -64,7 +64,8 @@ class CmdLineApp(cmd2.Cmd): # Make sure the directory exists, is a directory, and we have read access out = '' - err = '' + err = None + data = None if not os.path.isdir(path): err = '{!r} is not a directory'.format(path) elif not os.access(path, os.R_OK): @@ -77,10 +78,11 @@ class CmdLineApp(cmd2.Cmd): else: out = 'Successfully changed directory to {!r}\n'.format(path) self.stdout.write(out) + data = path if err: self.perror(err, traceback_war=False) - self._last_result = cmd2.CmdResult(out, err) + self._last_result = cmd2.CommandResult(out, err, data) # Enable tab completion for cd command def complete_cd(self, text, line, begidx, endidx): @@ -96,7 +98,7 @@ class CmdLineApp(cmd2.Cmd): if unknown: self.perror("dir does not take any positional arguments:", traceback_war=False) self.do_help('dir') - self._last_result = cmd2.CmdResult('', 'Bad arguments') + self._last_result = cmd2.CommandResult('', 'Bad arguments') return # Get the contents as a list @@ -109,7 +111,7 @@ class CmdLineApp(cmd2.Cmd): self.stdout.write(fmt.format(f)) self.stdout.write('\n') - self._last_result = cmd2.CmdResult(contents) + self._last_result = cmd2.CommandResult(data=contents) if __name__ == '__main__': |