[pywin32-checkins] pywin32/Pythonwin/pywin/framework intpyapp.py, 1.11.2.4, 1.11.2.5 scriptutils.py, 1.18.2.2, 1.18.2.3 startup.py, 1.4.2.2, 1.4.2.3

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

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

Modified Files:
      Tag: py3k
	intpyapp.py scriptutils.py startup.py 
Log Message:
merge more various changes from the trunk

Index: intpyapp.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/intpyapp.py,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -C2 -d -r1.11.2.4 -r1.11.2.5
*** intpyapp.py	27 Nov 2008 11:31:03 -0000	1.11.2.4
--- intpyapp.py	4 Dec 2008 07:28:46 -0000	1.11.2.5
***************
*** 292,296 ****
  		for module in modules:
  			try:
! 				exec("import "+module)
  			except: # Catch em all, else the app itself dies! 'ImportError:
  				traceback.print_exc()
--- 292,296 ----
  		for module in modules:
  			try:
! 				__import__(module)
  			except: # Catch em all, else the app itself dies! 'ImportError:
  				traceback.print_exc()

Index: startup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/startup.py,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -d -r1.4.2.2 -r1.4.2.3
*** startup.py	26 Nov 2008 07:17:38 -0000	1.4.2.2
--- startup.py	4 Dec 2008 07:28:46 -0000	1.4.2.3
***************
*** 34,38 ****
  # scripts when running under a GUI environment.
  
! moduleName = "intpyapp"
  sys.appargvoffset = 0
  sys.appargv = sys.argv[:]
--- 34,38 ----
  # scripts when running under a GUI environment.
  
! moduleName = "pywin.framework.intpyapp"
  sys.appargvoffset = 0
  sys.appargv = sys.argv[:]
***************
*** 46,51 ****
  	sys.argv = newargv
  
! # Import the module that runs our interactive app.
! from . import intpyapp
  
  try:
--- 46,51 ----
  	sys.argv = newargv
  
! # Import the application module.
! __import__(moduleName)
  
  try:

Index: scriptutils.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/scriptutils.py,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -C2 -d -r1.18.2.2 -r1.18.2.3
*** scriptutils.py	26 Nov 2008 07:17:38 -0000	1.18.2.2
--- scriptutils.py	4 Dec 2008 07:28:46 -0000	1.18.2.3
***************
*** 381,385 ****
  	modName, modExt = os.path.splitext(modName)
  	newPath = None
! 	for key, mod in sys.modules.iteritems():
  		if hasattr(mod, '__file__'):
  			fname = mod.__file__
--- 381,385 ----
  	modName, modExt = os.path.splitext(modName)
  	newPath = None
! 	for key, mod in sys.modules.items():
  		if hasattr(mod, '__file__'):
  			fname = mod.__file__
***************
*** 459,466 ****
  
  def RunTabNanny(filename):
! 	try:
! 		import cStringIO as io
! 	except ImportError:
! 		import io
  	tabnanny = FindTabNanny()
  	if tabnanny is None:
--- 459,463 ----
  
  def RunTabNanny(filename):
! 	import io as io
  	tabnanny = FindTabNanny()
  	if tabnanny is None: