Mercurial > python-cmd2
changeset 398:7812e00ff5b1
encode paste buffer write for Python 3
author | catherine.devlin@gmail.com |
---|---|
date | Sun, 19 Sep 2010 09:20:56 -0400 |
parents | 50acba85cf9e |
children | f7cb69b0da9e |
files | cmd2.py setup.py |
diffstat | 2 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/cmd2.py Fri Sep 17 11:32:36 2010 -0400 +++ b/cmd2.py Sun Sep 19 09:20:56 2010 -0400 @@ -46,8 +46,8 @@ raw_input = input else: import pyparsing - -__version__ = '0.6.0' + +_version__ = '0.6.1' class OptionParser(optparse.OptionParser): def exit(self, status=0, msg=None): @@ -205,11 +205,11 @@ return xclipproc.stdout.read() def write_to_paste_buffer(txt): xclipproc = subprocess.Popen('xclip -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) - xclipproc.stdin.write(txt) + xclipproc.stdin.write(txt.encode()) xclipproc.stdin.close() # but we want it in both the "primary" and "mouse" clipboards xclipproc = subprocess.Popen('xclip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) - xclipproc.stdin.write(txt) + xclipproc.stdin.write(txt.encode()) xclipproc.stdin.close() else: def get_paste_buffer(*args): @@ -399,6 +399,7 @@ ''') def poutput(self, msg): + '''Convenient shortcut for self.stdout.write(); adds newline if necessary.''' if msg: self.stdout.write(msg) if msg[-1] != '\n': @@ -767,6 +768,7 @@ finally: return self.postparsing_postcmd(stop) def complete_statement(self, line): + """Keep accepting lines of input until the command is complete.""" if (not line) or ( not pyparsing.Or(self.commentGrammars). setParseAction(lambda x: '').transformString(line)): @@ -798,7 +800,7 @@ mode = 'a' sys.stdout = self.stdout = open(os.path.expanduser(statement.parsed.outputTo), mode) else: - sys.stdout = self.stdout = tempfile.TemporaryFile() + sys.stdout = self.stdout = tempfile.TemporaryFile(mode="w+") if statement.parsed.output == '>>': self.stdout.write(get_paste_buffer()) @@ -1385,7 +1387,7 @@ if typ == bool: try: return bool(int(new)) - except ValueError, TypeError: + except (ValueError, TypeError): pass try: new = new.lower() @@ -1456,7 +1458,7 @@ self.transcripts[fname] = iter(tfile.readlines()) tfile.close() if not len(self.transcripts): - raise StandardError, "No test files found - nothing to test." + raise (StandardError,), "No test files found - nothing to test." def setUp(self): if self.CmdApp: self.outputTrap = OutputTrap()
--- a/setup.py Fri Sep 17 11:32:36 2010 -0400 +++ b/setup.py Sun Sep 19 09:20:56 2010 -0400 @@ -10,7 +10,7 @@ python3 = sys.version_info[0] > 2 if python3: install_requires = [] # will rely on local pyparsing_py3 copy - extra_modules = "pyparsing_py3" + extra_modules = ["pyparsing_py3"] else: install_requires = ['pyparsing>=1.5.1'] extra_modules = []