python-cmd2: cmd2.py comparison

comparison cmd2.py @ 267:3333e61e7103

poutput, perror, pfeedback

author	Catherine Devlin <catherine.devlin@gmail.com>
date	Tue, 07 Apr 2009 18:26:41 -0400
parents	ba45c2df855b
children	8f68e68033d4

comparison

equal deleted inserted replaced

-:ba45c2df855b
+:3333e61e7103
 default_file_name = 'command.txt'
 abbrev = True
 nonpythoncommand = 'cmd'
 current_script_dir = None
 reserved_words = []
+feedback_to_output = False
+quiet = False
 settable = ['prompt', 'continuation_prompt', 'default_file_name', 'editor',
-'case_insensitive', 'echo', 'timing', 'abbrev']
+'case_insensitive', 'feedback_to_output', 'quiet', 'echo', 'timing',
+'abbrev']
 settable.sort()
+def poutput(self, msg):
+self.stdout.write(msg)
+if msg[-1] != '\n':
+self.stdout('\n')
+def perror(self, errmsg):
+print str(errmsg)
+def pfeedback(self, msg):
+"""For printing nonessential feedback.  Can be silenced with `quiet`.
+Inclusion in redirected output is controlled by `feedback_to_output`."""
+if not self.quiet:
+if self.feedback_to_output:
+self.poutput(msg)
+else:
+print msg
 editor = os.environ.get('EDITOR')
 _STOP_AND_EXIT = 2
 if not editor:
 if sys.platform[:3] == 'win':
 editor = 'notepad'
 while statement.parsed.multilineCommand and (statement.parsed.terminator == ''):
 statement = '%s\n%s' % (statement.parsed.raw,
 self.pseudo_raw_input(self.continuation_prompt))
 statement = self.parsed(statement)
 except Exception, e:
-print e
+self.perror(e)
 return 0
 if statement.parsed.command not in self.excludeFromHistory:
 self.history.append(statement.parsed.raw)
 try:
 (stop, statement) = self.postparsing_precmd(statement)
 except Exception, e:
-print str(e)
+self.perror(e)
 return 0
 if stop:
 return self.postparsing_postcmd(stop)
 if not statement.parsed.command:
 if statement.parsed.output == '>>':
 mode = 'a'
 try:
 self.stdout = open(os.path.expanduser(statement.parsed.outputTo), mode)
 except OSError, e:
-print e
+self.perror(e)
 return self.postparsing_postcmd(stop=0)
 else:
 statekeeper = Statekeeper(self, ('stdout',))
 self.stdout = tempfile.TemporaryFile()
 if statement.parsed.output == '>>':
 except AttributeError:
 return self.postparsing_postcmd(self.default(statement))
 timestart = datetime.datetime.now()
 stop = func(statement)
 if self.timing:
-print 'Elapsed: %s' % str(datetime.datetime.now() - timestart)
+self.pfeedback('Elapsed: %s' % str(datetime.datetime.now() - timestart))
 except Exception, e:
-print e
+self.perror(e)
 finally:
 if statekeeper:
 if statement.parsed.output and not statement.parsed.outputTo:
 self.stdout.seek(0)
 try:
 writeToPasteBuffer(self.stdout.read())
 except Exception, e:
-print str(e)
+self.perror(e)
 elif statement.parsed.pipeTo:
 for result in redirect.communicate():
 statekeeper.stdout.write(result or '')
 self.stdout.close()
 statekeeper.restore()
 if p.startswith(param):
 val = getattr(self, p)
 self.stdout.write('%s: %s\n' % (p, str(getattr(self, p))))
 any_shown = True
 if not any_shown:
-print "Parameter '%s' not supported (type 'show' for list of parameters)." % param
+self.perror("Parameter '%s' not supported (type 'show' for list of parameters)." % param)
 def do_quit(self, arg):
 return self._STOP_AND_EXIT
 do_exit = do_quit
 do_q = do_quit
 raw_input(arg + '\n')
 def do_shell(self, arg):
 'execute a command as if at the OS prompt.'
 os.system(arg)
-def _attempt_py_command(self, arg):
-try:
-result = eval(arg, self.pystate)
-print repr(result)
-except SyntaxError:
-exec(arg, self.pystate)
-return
 def do_py(self, arg):
 '''
 py <command>: Executes a Python command.
 py: Enters interactive Python mode.
 End with `Ctrl-D` (Unix) / `Ctrl-Z` (Windows), `quit()`, 'exit()`.
 commands are run after editor is closed.
 "set edit (program-name)" or set  EDITOR environment variable
 to control which editing program is used."""
 if not self.editor:
-print "please use 'set editor' to specify your text editing program of choice."
+self.perror("Please use 'set editor' to specify your text editing program of choice.")
 return
 filename = self.default_file_name
 if arg:
 try:
 buffer = self.last_matching(int(arg))
 most recent command if omitted"""
 try:
 args = self.saveparser.parseString(arg)
 except pyparsing.ParseException:
-print self.do_save.__doc__
+self.perror(self.do_save.__doc__)
 return
 fname = args.fname or self.default_file_name
 if args.idx == '*':
 saveme = '\n\n'.join(self.history[:])
 elif args.idx:
 saveme = self.history[-1]
 try:
 f = open(os.path.expanduser(fname), 'w')
 f.write(saveme)
 f.close()
-print 'Saved to %s' % (fname)
+self.pfeedback('Saved to %s' % (fname))
 except Exception, e:
-print 'Error saving %s: %s' % (fname, str(e))
+self.perror('Error saving %s: %s' % (fname, str(e)))
 def read_file_or_url(self, fname):
 if isinstance(fname, file):
 target = open(fname, 'r')
 else:
 arg = arg.split(None, 1)
 targetname, args = arg[0], (arg[1:] or [''])[0].strip()
 try:
 target = self.read_file_or_url(targetname)
 except IOError, e:
-print 'Problem accessing script from %s: \n%s' % (targetname, e)
+self.perror('Problem accessing script from %s: \n%s' % (targetname, e))
 return
 keepstate = Statekeeper(self, ('stdin','use_rawinput','prompt',
 'continuation_prompt','current_script_dir'))
 self.stdin = target
 self.use_rawinput = False
 arg is string -> run most recent command by string search
 arg is /enclosed in forward-slashes/ -> run most recent by regex
 """
 'run [N]: runs the SQL that was run N commands ago'
 runme = self.last_matching(arg)
-print runme
+self.pfeedback(runme)
 if runme:
 runme = self.precmd(runme)
 stop = self.onecmd(runme)
 stop = self.postcmd(stop, runme)
 do_r = do_run

Mercurial > python-cmd2

comparison cmd2.py @ 267:3333e61e7103