[Python-checkins] CVS: python/dist/src/Mac/scripts ConfigurePython.py,1.39,1.40

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv18025/Python/Mac/scripts

Modified Files:
	ConfigurePython.py 
Log Message:
Import the MacOS toolbox modules from the Carbon package.

Index: ConfigurePython.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/ConfigurePython.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** ConfigurePython.py	2001/03/29 13:53:19	1.39
--- ConfigurePython.py	2001/08/25 12:02:19	1.40
***************
*** 14,18 ****
  import gestalt
  import string
! import Res
  
  SPLASH_COPYCORE=512
--- 14,18 ----
  import gestalt
  import string
! from Carbon import Res
  
  SPLASH_COPYCORE=512
***************
*** 90,94 ****
  	if macfs.FSSpec(sys.exec_prefix).as_tuple()[0] != -1: # XXXX
  		try:
! 			import Dlg
  			rv = Dlg.CautionAlert(ALERT_NONBOOT, None)
  			if rv == ALERT_NONBOOT_COPY:
--- 90,94 ----
  	if macfs.FSSpec(sys.exec_prefix).as_tuple()[0] != -1: # XXXX
  		try:
! 			from Carbon import Dlg
  			rv = Dlg.CautionAlert(ALERT_NONBOOT, None)
  			if rv == ALERT_NONBOOT_COPY:
***************
*** 142,146 ****
  		# Hack to make sure we get the new MACFS
  		sys.path.insert(0, os.path.join(oldcwd, ':Mac:Lib'))
! 		import Dlg
  		rv = Dlg.CautionAlert(ALERT_NOTPYTHONFOLDER, None)
  		if rv == ALERT_NOTPYTHONFOLDER_REMOVE_QUIT:
--- 142,146 ----
  		# Hack to make sure we get the new MACFS
  		sys.path.insert(0, os.path.join(oldcwd, ':Mac:Lib'))
! 		from Carbon import Dlg
  		rv = Dlg.CautionAlert(ALERT_NOTPYTHONFOLDER, None)
  		if rv == ALERT_NOTPYTHONFOLDER_REMOVE_QUIT:
***************
*** 163,167 ****
  	n = n + mkcorealias('PythonCoreCarbon', 'PythonCoreCarbon')
  	if n == 0:
! 		import Dlg
  		Dlg.CautionAlert(ALERT_NOCORE, None)
  		if verbose:
--- 163,167 ----
  	n = n + mkcorealias('PythonCoreCarbon', 'PythonCoreCarbon')
  	if n == 0:
! 		from Carbon import Dlg
  		Dlg.CautionAlert(ALERT_NOCORE, None)
  		if verbose: