[pywin32-checkins] pywin32/Pythonwin/pywin/framework intpyapp.py, 1.11.2.6, 1.11.2.7 scriptutils.py, 1.18.2.3, 1.18.2.4

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

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

Modified Files:
      Tag: py3k
	intpyapp.py scriptutils.py 
Log Message:
merge various fixes and cleanups from bzr integration branch

Index: intpyapp.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/intpyapp.py,v
retrieving revision 1.11.2.6
retrieving revision 1.11.2.7
diff -C2 -d -r1.11.2.6 -r1.11.2.7
*** intpyapp.py	6 Dec 2008 01:48:26 -0000	1.11.2.6
--- intpyapp.py	3 Jan 2009 04:45:17 -0000	1.11.2.7
***************
*** 304,310 ****
  			exec(command + "\n")
  		except:
- 			t,v,tb=sys.exc_info()
  			print("ERROR executing DDE command: ", command)
! 			traceback.print_exception(t,v,tb)
  			raise
  
--- 304,309 ----
  			exec(command + "\n")
  		except:
  			print("ERROR executing DDE command: ", command)
! 			traceback.print_exc()
  			raise
  
***************
*** 355,375 ****
  		global lastLocateFileName # save the new version away for next time...
  
! 		# Loop until a good name, or cancel
! 		while 1:
! 			name = dialog.GetSimpleInput('File name', lastLocateFileName, 'Locate Python File')
! 			if name is None: # Cancelled.
! 				break
! 			lastLocateFileName = name
! 			# if ".py" supplied, rip it off!
! 			# should also check for .pys and .pyw
! 			if lastLocateFileName[-3:].lower()=='.py':
! 				lastLocateFileName = lastLocateFileName[:-3]
! 			lastLocateFileName = lastLocateFileName.replace(".","\\")
! 			newName = scriptutils.LocatePythonFile(lastLocateFileName)
! 			if newName is None:
! 				win32ui.MessageBox("The file '%s' can not be located" % lastLocateFileName)
! 			else:
! 				win32ui.GetApp().OpenDocumentFile(newName)
! 				break
  
  	# Display all the "options" proprety pages we can find
--- 354,371 ----
  		global lastLocateFileName # save the new version away for next time...
  
! 		name = dialog.GetSimpleInput('File name', lastLocateFileName, 'Locate Python File')
! 		if name is None: # Cancelled.
! 			return
! 		lastLocateFileName = name
! 		# if ".py" supplied, rip it off!
! 		# should also check for .pys and .pyw
! 		if lastLocateFileName[-3:].lower()=='.py':
! 			lastLocateFileName = lastLocateFileName[:-3]
! 		lastLocateFileName = lastLocateFileName.replace(".","\\")
! 		newName = scriptutils.LocatePythonFile(lastLocateFileName)
! 		if newName is None:
! 			win32ui.MessageBox("The file '%s' can not be located" % lastLocateFileName)
! 		else:
! 			win32ui.GetApp().OpenDocumentFile(newName)
  
  	# Display all the "options" proprety pages we can find

Index: scriptutils.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/scriptutils.py,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -C2 -d -r1.18.2.3 -r1.18.2.4
*** scriptutils.py	4 Dec 2008 07:28:46 -0000	1.18.2.3
--- scriptutils.py	3 Jan 2009 04:45:17 -0000	1.18.2.4
***************
*** 581,585 ****
  		baseName = fileName
  		for path in sys.path:
! 			fileName = os.path.join(path, baseName)
  			if os.path.isdir(fileName):
  				if bBrowseIfDir:
--- 581,585 ----
  		baseName = fileName
  		for path in sys.path:
! 			fileName = os.path.abspath(os.path.join(path, baseName))
  			if os.path.isdir(fileName):
  				if bBrowseIfDir: