[Python-checkins] CVS: python/dist/src/Tools/idle AutoIndent.py,1.16,1.16.26.1

2002年1月28日 07:10:55 -0800

Update of /cvsroot/python/python/dist/src/Tools/idle
In directory usw-pr-cvs1:/tmp/cvs-serv565
Modified Files:
 Tag: release22-maint
	AutoIndent.py 
Log Message:
It's merge time!
Tim sez "Bugfix candidate: the current state of AutoIdent.py 
should be in 2.2.1."
Index: AutoIndent.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/idle/AutoIndent.py,v
retrieving revision 1.16
retrieving revision 1.16.26.1
diff -C2 -d -r1.16 -r1.16.26.1
*** AutoIndent.py	1999年06月11日 15:03:00	1.16
--- AutoIndent.py	2002年01月28日 15:10:52	1.16.26.1
***************
*** 172,176 ****
 have = len(expand(chars, tabwidth))
 assert have > 0
! want = int((have - 1) / self.indentwidth) * self.indentwidth
 ncharsdeleted = 0
 while 1:
--- 172,176 ----
 have = len(expand(chars, tabwidth))
 assert have > 0
! want = ((have - 1) // self.indentwidth) * self.indentwidth
 ncharsdeleted = 0
 while 1:
***************
*** 496,500 ****
 elif ch == '\t':
 raw = raw + 1
! effective = (effective / tabwidth + 1) * tabwidth
 else:
 break
--- 496,500 ----
 elif ch == '\t':
 raw = raw + 1
! effective = (effective // tabwidth + 1) * tabwidth
 else:
 break