[pywin32-checkins] pywin32/Pythonwin/pywin/framework intpyapp.py, 1.11.2.7, 1.11.2.8 scriptutils.py, 1.18.2.4, 1.18.2.5 stdin.py, 1.3.2.3, 1.3.2.4 toolmenu.py, 1.3.4.1, 1.3.4.2

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4261/Pythonwin/pywin/framework

Modified Files:
      Tag: py3k
	intpyapp.py scriptutils.py stdin.py toolmenu.py 
Log Message:
merge lots of changes (most via 2to3) from the trunk

Index: toolmenu.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/toolmenu.py,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C2 -d -r1.3.4.1 -r1.3.4.2
*** toolmenu.py	29 Aug 2008 06:16:42 -0000	1.3.4.1
--- toolmenu.py	5 Jan 2009 12:51:26 -0000	1.3.4.2
***************
*** 14,22 ****
  defaultToolMenuItems = [
  	('Browser', 'win32ui.GetApp().OnViewBrowse(0,0)'),
!        ('Browse PythonPath', 'from pywin.tools import browseProjects;browseProjects.Browse()'),
!        ('Edit Python Path', 'from pywin.tools import regedit;regedit.EditRegistry()'),
!        ('COM Makepy utility', 'from win32com.client import makepy;makepy.main()'),
!        ('COM Browser', 'from win32com.client import combrowse;combrowse.main()'),
!        ('Trace Collector Debugging tool', 'from pywin.tools import TraceCollector;TraceCollector.MakeOutputWindow()'),
  ]
  
--- 14,22 ----
  defaultToolMenuItems = [
  	('Browser', 'win32ui.GetApp().OnViewBrowse(0,0)'),
! 	('Browse PythonPath', 'from pywin.tools import browseProjects;browseProjects.Browse()'),
! 	('Edit Python Path', 'from pywin.tools import regedit;regedit.EditRegistry()'),
! 	('COM Makepy utility', 'from win32com.client import makepy;makepy.main()'),
! 	('COM Browser', 'from win32com.client import combrowse;combrowse.main()'),
! 	('Trace Collector Debugging tool', 'from pywin.tools import TraceCollector;TraceCollector.MakeOutputWindow()'),
  ]
  

Index: intpyapp.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/intpyapp.py,v
retrieving revision 1.11.2.7
retrieving revision 1.11.2.8
diff -C2 -d -r1.11.2.7 -r1.11.2.8
*** intpyapp.py	3 Jan 2009 04:45:17 -0000	1.11.2.7
--- intpyapp.py	5 Jan 2009 12:51:26 -0000	1.11.2.8
***************
*** 60,64 ****
  					pywin.debugger.currentDebugger.close(1)
  				except:
- 					import traceback
  					traceback.print_exc()
  				return
--- 60,63 ----

Index: stdin.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/stdin.py,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -d -r1.3.2.3 -r1.3.2.4
*** stdin.py	26 Nov 2008 09:03:28 -0000	1.3.2.3
--- stdin.py	5 Jan 2009 12:51:26 -0000	1.3.2.4
***************
*** 22,27 ****
      get_input_line = raw_input # py2x
  except NameError:
!     import code
!     get_input_line = code.InteractiveConsole.raw_input
  
  class Stdin:
--- 22,26 ----
      get_input_line = raw_input # py2x
  except NameError:
!     get_input_line = input # py3k
  
  class Stdin:
***************
*** 95,99 ****
              try:
                  self.__get_line()
!             except EOFError: # deal with cancellation of get_input_line dialog
                  desired_size = len(self.buffer) # Be satisfied!
  
--- 94,98 ----
              try:
                  self.__get_line()
!             except (EOFError, KeyboardInterrupt): # deal with cancellation of get_input_line dialog
                  desired_size = len(self.buffer) # Be satisfied!
  

Index: scriptutils.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/scriptutils.py,v
retrieving revision 1.18.2.4
retrieving revision 1.18.2.5
diff -C2 -d -r1.18.2.4 -r1.18.2.5
*** scriptutils.py	3 Jan 2009 04:45:17 -0000	1.18.2.4
--- scriptutils.py	5 Jan 2009 12:51:26 -0000	1.18.2.5
***************
*** 329,342 ****
  		bWorked = 1
  	except:
- 		## ??? sys.exc_info is reset to (None, None, None) after some function calls -
- 		##	Is this a 'feature' of py3k, or are we clearing an error somewhere ???
- 		exc_type, exc_value, exc_traceback=sys.exc_info()
  		if interact.edit and interact.edit.currentView:
  			interact.edit.currentView.EnsureNoPrompt()
! 		traceback.print_exception(exc_type, exc_value, exc_traceback)
  		if interact.edit and interact.edit.currentView:
  			interact.edit.currentView.AppendToPrompt([])
  		if debuggingType == RS_DEBUGGER_PM:
! 			debugger.pm(exc_traceback)
  	sys.argv = oldArgv
  	if insertedPath0:
--- 329,339 ----
  		bWorked = 1
  	except:
  		if interact.edit and interact.edit.currentView:
  			interact.edit.currentView.EnsureNoPrompt()
! 		traceback.print_exc()
  		if interact.edit and interact.edit.currentView:
  			interact.edit.currentView.AppendToPrompt([])
  		if debuggingType == RS_DEBUGGER_PM:
! 			debugger.pm()
  	sys.argv = oldArgv
  	if insertedPath0: