[Python-checkins] python/dist/src/Lib/plat-mac buildtools.py,1.7,1.8 macresource.py,1.3,1.4

2003年2月25日 15:02:13 -0800

Update of /cvsroot/python/python/dist/src/Lib/plat-mac
In directory sc8-pr-cvs1:/tmp/cvs-serv15813
Modified Files:
	buildtools.py macresource.py 
Log Message:
If a resource file cannot be decoded because the directory is readonly
create a temporary file. This fixes #688011.
Got rid of the install() method in macresource, and replaced it with
a resource_filename() method which will optionally decode a given resourcefile
(which may be applesingle-encoded) and return the real resourcefile.
Use this new method in buildtools to copy the correct resource file to
the bundle. This fixes #688007.
Index: buildtools.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/buildtools.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** buildtools.py	24 Feb 2003 16:26:25 -0000	1.7
--- buildtools.py	25 Feb 2003 23:02:03 -0000	1.8
***************
*** 300,304 ****
 	builder.name = shortname
 	if rsrcname:
! 		builder.resources.append(rsrcname)
 	for o in others:
 		if type(o) == str:
--- 300,306 ----
 	builder.name = shortname
 	if rsrcname:
! 		realrsrcname = macresource.resource_pathname(rsrcname)
! 		builder.files.append((realrsrcname, 
! 			os.path.join('Contents/Resources', os.path.basename(rsrcname))))
 	for o in others:
 		if type(o) == str:
Index: macresource.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/macresource.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** macresource.py	17 Feb 2003 16:47:12 -0000	1.3
--- macresource.py	25 Feb 2003 23:02:03 -0000	1.4
***************
*** 97,100 ****
--- 97,126 ----
 	return refno

+ def resource_pathname(pathname, verbose=0):
+ 	"""Return the pathname for a resource file (either DF or RF based).
+ 	If the pathname given already refers to such a file simply return it,
+ 	otherwise first decode it."""
+ 	try:
+ 		refno = Res.FSpOpenResFile(pathname, 1)
+ 		Res.CloseResFile(refno)
+ 	except Res.Error, arg:
+ 		if arg[0] in (-37, -39):
+ 			# No resource fork. We may be on OSX, and this may be either
+ 			# a data-fork based resource file or a AppleSingle file
+ 			# from the CVS repository.
+ 			try:
+ 				refno = Res.FSOpenResourceFile(pathname, u'', 1)
+ 			except Res.Error, arg:
+ 				if arg[0] != -199:
+ 					# -199 is "bad resource map"
+ 					raise
+ 			else:
+ 				return refno
+ 			# Finally try decoding an AppleSingle file
+ 			pathname = _decode(pathname, verbose=verbose)
+ 		else:
+ 			raise
+ 	return pathname
+ 	
 def open_error_resource():
 	"""Open the resource file containing the error code to error message
***************
*** 102,151 ****
 	need('Estr', 1, filename="errors.rsrc", modname=__name__)

! def _decode(pathname, verbose=0, newpathname=None):
 	# Decode an AppleSingle resource file, return the new pathname.
! 	if not newpathname:
! 		newpathname = pathname + '.df.rsrc'
! 		if os.path.exists(newpathname) and \
! 			os.stat(newpathname).st_mtime >= os.stat(pathname).st_mtime:
! 			return newpathname
 	if verbose:
! 		print 'Decoding', pathname
 	import applesingle
 	applesingle.decode(pathname, newpathname, resonly=1)
 	return newpathname
- 	
- def install(src, dst, mkdirs=0):
- 	"""Copy a resource file. The result will always be a datafork-based
- 	resource file, whether the source is datafork-based, resource-fork
- 	based or AppleSingle-encoded."""
- 	if mkdirs:
- 		macostools.mkdirs(os.path.split(dst)[0])
- 	try:
- 		refno = Res.FSOpenResourceFile(src, u'', 1)
- 	except Res.Error, arg:
- 		if arg[0] != -199:
- 			# -199 is "bad resource map"
- 			raise
- 	else:
- 		# Resource-fork based. Simply copy.
- 		Res.CloseResFile(refno)
- 		macostools.copy(src, dst)
- 		
- 	try:
- 		refno = Res.FSpOpenResFile(src, 1)
- 	except Res.Error, arg:
- 		if not arg[0] in (-37, -39):
- 			raise
- 	else:
- 		Res.CloseResFile(refno)
- 		BUFSIZ=0x80000 # Copy in 0.5Mb chunks
- 		ifp = MacOS.openrf(src, '*rb')
- 		ofp = open(dst, 'wb')
- 		d = ifp.read(BUFSIZ)
- 		while d:
- 			ofp.write(d)
- 			d = ifp.read(BUFSIZ)
- 		ifp.close()
- 		ofp.close()
- 		
- 	_decode(src, newpathname=dst)
--- 128,146 ----
 	need('Estr', 1, filename="errors.rsrc", modname=__name__)

! def _decode(pathname, verbose=0):
 	# Decode an AppleSingle resource file, return the new pathname.
! 	newpathname = pathname + '.df.rsrc'
! 	if os.path.exists(newpathname) and \
! 		os.stat(newpathname).st_mtime >= os.stat(pathname).st_mtime:
! 		return newpathname
! 	if hasattr(os, 'access') and not \
! 		os.access(os.path.dirname(pathname), os.W_OK|os.X_OK):
! 		# The destination directory isn't writeable. Create the file in
! 		# a temporary directory
! 		import tempfile
! 		fd, newpathname = tempfile.mkstemp(".rsrc")
 	if verbose:
! 		print 'Decoding', pathname, 'to', newpathname
 	import applesingle
 	applesingle.decode(pathname, newpathname, resonly=1)
 	return newpathname