[Pydev-cvs] org.python.pydev.debug/pysrc pydevd_vars.py, 1.43, 1.44 pydevd.py, 1.91, 1.92 pydevd_constants.py, 1.11, 1.12 pydevd_frame.py, 1.23, 1.24 pydevd_comm.py, 1.39, 1.40

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev.debug/pysrc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8149/pysrc

Modified Files:
	pydevd_vars.py pydevd.py pydevd_constants.py pydevd_frame.py 
	pydevd_comm.py 
Log Message:
sys.exc_clear() used if ImportError is found while looking for psyco.

http://sourceforge.net/tracker/index.php?func=detail&aid=1938529&group_id=85796&atid=577329

Index: pydevd.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/pysrc/pydevd.py,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** pydevd.py	6 Mar 2008 11:33:03 -0000	1.91
--- pydevd.py	12 Apr 2008 16:19:50 -0000	1.92
***************
*** 2,7 ****
  from pydevd_constants import * #@UnusedWildImport
  
- import sys
- 
  from pydevd_comm import  CMD_CHANGE_VARIABLE,\
                           CMD_EVALUATE_EXPRESSION,\
--- 2,5 ----
***************
*** 618,621 ****
--- 616,620 ----
              getInternalQueue = psyco.proxy(getInternalQueue)
          except ImportError:
+             sys.exc_clear() #don't keep the traceback
              if not sys.platform.startswith("java"):
                  print >> sys.stderr, 'pydev debugger: warning: psyco not available for debugger speedups'
***************
*** 816,820 ****
          usage(1)
      
!     #as to get here all our imports are already resovled, the psyco module can be
      #changed and we'll still get the speedups in the debugger, as those functions 
      #are already compiled at this time.
--- 815,819 ----
          usage(1)
      
!     #as to get here all our imports are already resolved, the psyco module can be
      #changed and we'll still get the speedups in the debugger, as those functions 
      #are already compiled at this time.
***************
*** 822,825 ****
--- 821,825 ----
          import psyco 
      except ImportError:
+         sys.exc_clear()
          pass #that's ok, no need to mock psyco if it's not available anyways
      else:

Index: pydevd_frame.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/pysrc/pydevd_frame.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** pydevd_frame.py	18 Feb 2008 17:11:48 -0000	1.23
--- pydevd_frame.py	12 Apr 2008 16:19:51 -0000	1.24
***************
*** 152,154 ****
--- 152,155 ----
              trace_dispatch = psyco.proxy(trace_dispatch)
          except ImportError:
+             sys.exc_clear() #don't keep the traceback
              pass #ok, psyco not available

Index: pydevd_comm.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/pysrc/pydevd_comm.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** pydevd_comm.py	16 Feb 2008 23:37:35 -0000	1.39
--- pydevd_comm.py	12 Apr 2008 16:19:51 -0000	1.40
***************
*** 57,61 ****
  
  import time
- import sys
  import threading
  import Queue as PydevQueue
--- 57,60 ----

Index: pydevd_vars.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/pysrc/pydevd_vars.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** pydevd_vars.py	18 Mar 2008 02:55:03 -0000	1.43
--- pydevd_vars.py	12 Apr 2008 16:19:50 -0000	1.44
***************
*** 157,161 ****
          varToXML = psyco.proxy(varToXML)
      except ImportError:
!         pass
  
  
--- 157,161 ----
          varToXML = psyco.proxy(varToXML)
      except ImportError:
!         sys.exc_clear() #don't keep the traceback
  
  

Index: pydevd_constants.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/pysrc/pydevd_constants.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pydevd_constants.py	18 Mar 2008 02:55:03 -0000	1.11
--- pydevd_constants.py	12 Apr 2008 16:19:51 -0000	1.12
***************
*** 25,29 ****
  
  #Hold a reference to the original _getframe (because psyco will change that as soon as it's imported)
! import sys
  GetFrame = sys._getframe
  
--- 25,29 ----
  
  #Hold a reference to the original _getframe (because psyco will change that as soon as it's imported)
! import sys #Note: the sys import must be here anyways (others depend on it)
  GetFrame = sys._getframe