Mercurial > python-cmd2
changeset 354:7cd04727f7f7
redirect works even with print
| author | catherine@dellzilla |
|---|---|
| date | Wed, 17 Feb 2010 12:08:42 -0500 |
| parents | 5e3f918c41d8 |
| children | 5972ae04515e |
| files | cmd2.py docs/pycon2010/pirate6.py |
| diffstat | 2 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/cmd2.py Wed Feb 17 00:01:55 2010 -0500 +++ b/cmd2.py Wed Feb 17 12:08:42 2010 -0500 @@ -183,7 +183,7 @@ except ImportError: def get_paste_buffer(*args): raise OSError, pastebufferr % ('pywin32', 'Download from http://sourceforge.net/projects/pywin32/') - setPasteBuffer = get_paste_buffer + write_to_paste_buffer = get_paste_buffer else: can_clip = False try: @@ -214,8 +214,7 @@ else: def get_paste_buffer(*args): raise OSError, pastebufferr % ('xclip', 'On Debian/Ubuntu, install with "sudo apt-get install xclip"') - setPasteBuffer = get_paste_buffer - writeToPasteBuffer = get_paste_buffer + write_to_paste_buffer = get_paste_buffer pyparsing.ParserElement.setDefaultWhitespaceChars(' \t') @@ -787,18 +786,20 @@ def redirect_output(self, statement): if statement.parsed.pipeTo: - self.kept_state = Statekeeper(self, ('stdout',)) + self.kept_state = Statekeeper(self, ('stdout',)) + self.kept_sys = Statekeeper(sys, ('stdout',)) self.redirect = subprocess.Popen(statement.parsed.pipeTo, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) - self.stdout = self.redirect.stdin + sys.stdout = self.stdout = self.redirect.stdin elif statement.parsed.output: self.kept_state = Statekeeper(self, ('stdout',)) + self.kept_sys = Statekeeper(sys, ('stdout',)) if statement.parsed.outputTo: mode = 'w' if statement.parsed.output == '>>': mode = 'a' - self.stdout = open(os.path.expanduser(statement.parsed.outputTo), mode) + sys.stdout = self.stdout = open(os.path.expanduser(statement.parsed.outputTo), mode) else: - self.stdout = tempfile.TemporaryFile() + sys.stdout = self.stdout = tempfile.TemporaryFile() if statement.parsed.output == '>>': self.stdout.write(get_paste_buffer()) @@ -812,7 +813,8 @@ for result in self.redirect.communicate(): self.kept_state.stdout.write(result or '') self.stdout.close() - self.kept_state.restore() + self.kept_state.restore() + self.kept_sys.restore() self.kept_state = None def onecmd(self, line):