[pywin32-checkins] pywin32/Pythonwin/pywin/framework app.py, 1.13, 1.14 scriptutils.py, 1.17, 1.18

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25015

Modified Files:
	app.py scriptutils.py 
Log Message:
Remove mutual import between app and scriptutils

Index: app.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/app.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** app.py	9 Aug 2008 16:47:07 -0000	1.13
--- app.py	11 Aug 2008 00:38:28 -0000	1.14
***************
*** 375,385 ****
  sys.modules['__builtin__'].input=Win32Input
  
- try:
- 	# LocatePythonFile used to be here.
- 	# THIS WILL BE DELETED SOON.
- 	from scriptutils import LocatePythonFile
- except:
- 	pass
- 
  def HaveGoodGUI():
  	"""Returns true if we currently have a good gui available.
--- 375,378 ----

Index: scriptutils.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/scriptutils.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** scriptutils.py	9 Aug 2008 16:47:07 -0000	1.17
--- scriptutils.py	11 Aug 2008 00:38:28 -0000	1.18
***************
*** 2,6 ****
  Various utilities for running/importing a script
  """
- import app
  import sys
  import win32ui
--- 2,5 ----
***************
*** 253,257 ****
  			script = fnameonly
  		except os.error:
! 			fullScript = app.LocatePythonFile(script)
  			if fullScript is None:
  				win32ui.MessageBox("The file '%s' can not be located" % script )
--- 252,256 ----
  			script = fnameonly
  		except os.error:
! 			fullScript = LocatePythonFile(script)
  			if fullScript is None:
  				win32ui.MessageBox("The file '%s' can not be located" % script )