[Python-checkins] python/dist/src/Demo/pdist rrcs.py,1.6,1.6.30.1 rcvs.py,1.21,1.21.30.1 rcslib.py,1.8,1.8.18.1

[jhylton@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Demo/pdist
In directory sc8-pr-cvs1:/tmp/cvs-serv27228/Demo/pdist

Modified Files:
      Tag: ast-branch
	rrcs.py rcvs.py rcslib.py 
Log Message:
Merge head to this branch.

Merge all sorts of changes from just before 2.3b1 into the ast
branch.  This should make the eventual merge back to the trunk easier.

The merge is almost entirely porting changes into the ast-branch.
There was no attempt to get changes to compile.c into newcompile.c.
That work should be done when newcompile.c is closer to completion.

The only significant conflicts appeared to be in pythonrun.c.


Index: rrcs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Demo/pdist/rrcs.py,v
retrieving revision 1.6
retrieving revision 1.6.30.1
diff -C2 -d -r1.6 -r1.6.30.1
*** rrcs.py	27 Nov 1996 19:49:26 -0000	1.6
--- rrcs.py	28 Apr 2003 17:38:41 -0000	1.6.30.1
***************
*** 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):

Index: rcvs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Demo/pdist/rcvs.py,v
retrieving revision 1.21
retrieving revision 1.21.30.1
diff -C2 -d -r1.21 -r1.21.30.1
*** rcvs.py	27 Nov 1996 19:49:24 -0000	1.21
--- rcvs.py	28 Apr 2003 17:38:42 -0000	1.21.30.1
***************
*** 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: rcslib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Demo/pdist/rcslib.py,v
retrieving revision 1.8
retrieving revision 1.8.18.1
diff -C2 -d -r1.8 -r1.8.18.1
*** rcslib.py	20 Jul 2001 19:00:52 -0000	1.8
--- rcslib.py	28 Apr 2003 17:38:43 -0000	1.8.18.1
***************
*** 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 ---