[pywin32-checkins] pywin32/Pythonwin/pywin/framework intpyapp.py, 1.12, 1.13 startup.py, 1.5, 1.6

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

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

Modified Files:
	intpyapp.py startup.py 
Log Message:
use py3k-friendly fully-qualified module names and __import__ over exec to boot pythonwin

Index: intpyapp.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/intpyapp.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** intpyapp.py	26 Nov 2008 08:39:32 -0000	1.12
--- intpyapp.py	4 Dec 2008 05:21:13 -0000	1.13
***************
*** 278,287 ****
  
  	def LoadSystemModules(self):
! 		self.DoLoadModules("editor,stdin")
  
  	def LoadUserModules(self, moduleNames = None):
  		# Load the users modules.
  		if moduleNames is None:
! 			default = "sgrepmdi,mdi_pychecker"
  			moduleNames=win32ui.GetProfileVal('Python','Startup Modules',default)
  		self.DoLoadModules(moduleNames)
--- 278,287 ----
  
  	def LoadSystemModules(self):
! 		self.DoLoadModules("pywin.framework.editor,pywin.framework.stdin")
  
  	def LoadUserModules(self, moduleNames = None):
  		# Load the users modules.
  		if moduleNames is None:
! 			default = "pywin.framework.sgrepmdi,pywin.framework.mdi_pychecker"
  			moduleNames=win32ui.GetProfileVal('Python','Startup Modules',default)
  		self.DoLoadModules(moduleNames)
***************
*** 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** startup.py	14 Nov 2008 00:22:25 -0000	1.5
--- startup.py	4 Dec 2008 05:21:13 -0000	1.6
***************
*** 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[:]
***************
*** 45,50 ****
  #	newargv.insert(0, sys.argv[0])
  	sys.argv = newargv
! 	
! exec "import %s\n" % moduleName
  
  try:
--- 45,51 ----
  #	newargv.insert(0, sys.argv[0])
  	sys.argv = newargv
! 
! # Import the application module.
! __import__(moduleName)
  
  try: