[Python-checkins] python/dist/src/Demo/pdist rcslib.py,1.8,1.9 rcvs.py,1.21,1.22 rrcs.py,1.6,1.7

2002年8月09日 09:38:34 -0700

Update of /cvsroot/python/python/dist/src/Demo/pdist
In directory usw-pr-cvs1:/tmp/cvs-serv23808/pdist
Modified Files:
	rcslib.py rcvs.py rrcs.py 
Log Message:
Massive changes from SF 589982 (tempfile.py rewrite, by Zack
Weinberg). This changes all uses of deprecated tempfile functions to
the recommended ones.
Index: rcslib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Demo/pdist/rcslib.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** rcslib.py	20 Jul 2001 19:00:52 -0000	1.8
--- rcslib.py	9 Aug 2002 16:38:32 -0000	1.9
***************
*** 144,163 ****
 message = message + '\n'
 lockflag = "-u"
! textfile = None
! try:
! if new:
! textfile = tempfile.mktemp()
! f = open(textfile, 'w')
! f.write(message)
! f.close()
! cmd = 'ci %s%s -t%s %s %s' % \
! (lockflag, rev, textfile, otherflags, name)
! else:
! message = regsub.gsub('\([\\"$`]\)', '\\\\\1円', message)
! cmd = 'ci %s%s -m"%s" %s %s' % \
! (lockflag, rev, message, otherflags, name)
! return self._system(cmd)
! finally:
! if textfile: self._remove(textfile)
 
 # --- Exported support methods ---
--- 144,158 ----
 message = message + '\n'
 lockflag = "-u"
! if new:
! f = tempfile.NamedTemporaryFile()
! f.write(message)
! f.flush()
! cmd = 'ci %s%s -t%s %s %s' % \
! (lockflag, rev, f.name, otherflags, name)
! else:
! message = regsub.gsub('\([\\"$`]\)', '\\\\\1円', message)
! cmd = 'ci %s%s -m"%s" %s %s' % \
! (lockflag, rev, message, otherflags, name)
! return self._system(cmd)
 
 # --- Exported support methods ---
Index: rcvs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Demo/pdist/rcvs.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** rcvs.py	27 Nov 1996 19:49:24 -0000	1.21
--- rcvs.py	9 Aug 2002 16:38:32 -0000	1.22
***************
*** 173,187 ****
 			return
 		import tempfile
! 		tfn = tempfile.mktemp()
! 		try:
! 			tf = open(tfn, 'w')
! 			tf.write(data)
! 			tf.close()
! 			print 'diff %s -r%s %s' % (flags, rev, fn)
! 			sts = os.system('diff %s %s %s' % (flags, tfn, fn))
! 			if sts:
! 				print '='*70
! 		finally:
! 			remove(tfn)
 
 	def commitcheck(self):
--- 173,183 ----
 			return
 		import tempfile
! 		tf = tempfile.NamedTemporaryFile()
! 		tf.write(data)
! 		tf.flush()
! 		print 'diff %s -r%s %s' % (flags, rev, fn)
! 		sts = os.system('diff %s %s %s' % (flags, tf.name, fn))
! 		if sts:
! 			print '='*70
 
 	def commitcheck(self):
Index: rrcs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Demo/pdist/rrcs.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rrcs.py	27 Nov 1996 19:49:26 -0000	1.6
--- rrcs.py	9 Aug 2002 16:38:32 -0000	1.7
***************
*** 103,117 ****
 	flags = flags[1:]
 	data = x.get(fn)
! 	tfn = tempfile.mktemp()
! 	try:
! 		tf = open(tfn, 'w')
! 		tf.write(data)
! 		tf.close()
! 		print 'diff %s -r%s %s' % (flags, x.head(fn), fn)
! 		sts = os.system('diff %s %s %s' % (flags, tfn, fn))
! 		if sts:
! 			print '='*70
! 	finally:
! 		remove(tfn)
 
 def same(x, copts, fn, data = None):
--- 103,113 ----
 	flags = flags[1:]
 	data = x.get(fn)
! 	tf = tempfile.NamedTemporaryFile()
! 	tf.write(data)
! 	tf.flush()
! 	print 'diff %s -r%s %s' % (flags, x.head(fn), fn)
! 	sts = os.system('diff %s %s %s' % (flags, tf.name, fn))
! 	if sts:
! 		print '='*70
 
 def same(x, copts, fn, data = None):