[pywin32-checkins] pywin32/Pythonwin/pywin/framework app.py, 1.14.2.1, 1.14.2.2

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

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

Modified Files:
      Tag: py3k
	app.py 
Log Message:
merge various minor changes from trunk

Index: app.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/app.py,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -d -r1.14.2.1 -r1.14.2.2
*** app.py	29 Aug 2008 06:16:41 -0000	1.14.2.1
--- app.py	4 Dec 2008 05:06:25 -0000	1.14.2.2
***************
*** 11,16 ****
  import string
  import os
! from pywin.mfc import window, dialog, thread, afxres
  import traceback
  from . import scriptutils
  
--- 11,19 ----
  import string
  import os
! from pywin.mfc import window, dialog, afxres
! from pywin.mfc.thread import WinApp
  import traceback
+ import regutil
+ 
  from . import scriptutils
  
***************
*** 113,121 ****
  		return 0
  
! class CApp(thread.WinApp):
  	" A class for the application "
  	def __init__(self):
  		self.oldCallbackCaller = None
! 		thread.WinApp.__init__(self, win32ui.GetApp() )
  		self.idleHandlers = []
  		
--- 116,124 ----
  		return 0
  
! class CApp(WinApp):
  	" A class for the application "
  	def __init__(self):
  		self.oldCallbackCaller = None
! 		WinApp.__init__(self, win32ui.GetApp() )
  		self.idleHandlers = []
  		
***************
*** 196,200 ****
  	def OnHelp(self,id, code):
  		try:
- 			import regutil
  			if id==win32ui.ID_HELP_GUI_REF:
  				helpFile = regutil.GetRegisteredHelpFile("Pythonwin Reference")
--- 199,202 ----
***************
*** 372,381 ****
  	return eval(input(prompt))
  
! 
! ## sys.modules['__builtin__'].raw_input=Win32RawInput
! ## sys.modules['__builtin__'].input=Win32Input
! import code
! code.InteractiveConsole.raw_input=Win32RawInput
! code.InteractiveConsole.input=Win32Input
  
  def HaveGoodGUI():
--- 374,385 ----
  	return eval(input(prompt))
  
! try:
! 	raw_input
! 	# must be py2x...
! 	sys.modules['__builtin__'].raw_input=Win32RawInput
! except NameError:
! 	# must be py3k
! 	import code
! 	code.InteractiveConsole.input=Win32Input
  
  def HaveGoodGUI():