[Pydev-cvs] org.python.pydev.debug/pysrc pydevd_vars.py,1.23,1.24 pydevd.py,1.38,1.39 pydevd_comm.py
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2006-02-09 18:52:37
|
Update of /cvsroot/pydev/org.python.pydev.debug/pysrc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20858/pysrc Modified Files: pydevd_vars.py pydevd.py pydevd_comm.py Log Message: Index: pydevd.py =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.debug/pysrc/pydevd.py,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** pydevd.py 1 Feb 2006 20:12:57 -0000 1.38 --- pydevd.py 9 Feb 2006 18:52:29 -0000 1.39 *************** *** 313,322 **** #print >> sys.stderr, "breakpoint not found", file, str(line) ! elif id == CMD_EVALUATE_EXPRESSION: #command to evaluate the given expression #text is: thread\tstackframe\tLOCAL\texpression thread_id, frame_id, scope, expression = text.split('\t', 3) thread_id = long(thread_id) ! int_cmd = InternalEvaluateExpression(seq, thread_id, frame_id, expression) self.postInternalCommand(int_cmd, thread_id) --- 313,322 ---- #print >> sys.stderr, "breakpoint not found", file, str(line) ! elif id == CMD_EVALUATE_EXPRESSION or id == CMD_EXEC_EXPRESSION: #command to evaluate the given expression #text is: thread\tstackframe\tLOCAL\texpression thread_id, frame_id, scope, expression = text.split('\t', 3) thread_id = long(thread_id) ! int_cmd = InternalEvaluateExpression(seq, thread_id, frame_id, expression, id == CMD_EXEC_EXPRESSION) self.postInternalCommand(int_cmd, thread_id) Index: pydevd_comm.py =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.debug/pysrc/pydevd_comm.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pydevd_comm.py 3 Feb 2006 17:27:30 -0000 1.7 --- pydevd_comm.py 9 Feb 2006 18:52:29 -0000 1.8 *************** *** 84,87 **** --- 84,88 ---- CMD_EVALUATE_EXPRESSION = 113 CMD_GET_FRAME = 114 + CMD_EXEC_EXPRESSION = 115 CMD_VERSION = 501 CMD_RETURN = 502 *************** *** 441,454 **** """ gets the value of a variable """ ! def __init__(self, seq, thread_id, frame_id, expression): self.sequence = seq self.thread_id = thread_id self.frame_id = frame_id self.expression = expression def doIt(self, dbg): """ Converts request into python variable """ try: ! result = pydevd_vars.evaluateExpression( self.thread_id, self.frame_id, self.expression ) xml = "<xml>" xml += pydevd_vars.varToXML(result, "") --- 442,456 ---- """ gets the value of a variable """ ! def __init__(self, seq, thread_id, frame_id, expression, doExec): self.sequence = seq self.thread_id = thread_id self.frame_id = frame_id self.expression = expression + self.doExec = doExec def doIt(self, dbg): """ Converts request into python variable """ try: ! result = pydevd_vars.evaluateExpression( self.thread_id, self.frame_id, self.expression, self.doExec ) xml = "<xml>" xml += pydevd_vars.varToXML(result, "") Index: pydevd_vars.py =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.debug/pysrc/pydevd_vars.py,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** pydevd_vars.py 8 Feb 2006 17:58:19 -0000 1.23 --- pydevd_vars.py 9 Feb 2006 18:52:29 -0000 1.24 *************** *** 241,251 **** traceback.print_exc() ! def evaluateExpression( thread_id, frame_id, expression ): ! """returns the result of the evaluated expression""" frame = findFrame(thread_id, frame_id) ! result = None ! try: ! result = eval( expression, frame.f_globals, frame.f_locals ) ! except Exception, e: ! result = str( e ) ! return result --- 241,260 ---- traceback.print_exc() ! def evaluateExpression( thread_id, frame_id, expression, doExec ): ! '''returns the result of the evaluated expression ! @param doExec: determines if we should do an exec or an eval ! ''' frame = findFrame(thread_id, frame_id) ! ! expression = expression.replace('@LINE@', '\n') ! if doExec: ! exec expression in frame.f_globals, frame.f_locals ! return ! ! else: ! result = None ! try: ! result = eval( expression, frame.f_globals, frame.f_locals ) ! except Exception, e: ! result = str( e ) ! return result |