summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael W. Hudson <mwh@python.net>2002-01-28 15:10:52 (GMT)
committerMichael W. Hudson <mwh@python.net>2002-01-28 15:10:52 (GMT)
commitabab74038d1f289d4b76cc44ddc4c66170e15522 (patch)
tree413506a7f49b8d1ee5870eabe6869e948457993e
parent96baec20f2199ab89bd4725875831bead0295898 (diff)
downloadcpython-abab74038d1f289d4b76cc44ddc4c66170e15522.zip
cpython-abab74038d1f289d4b76cc44ddc4c66170e15522.tar.gz
cpython-abab74038d1f289d4b76cc44ddc4c66170e15522.tar.bz2
It's merge time!
Tim sez "Bugfix candidate: the current state of AutoIdent.py should be in 2.2.1."
-rw-r--r--Tools/idle/AutoIndent.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/idle/AutoIndent.py b/Tools/idle/AutoIndent.py
index 66a0aec..f8bb847 100644
--- a/Tools/idle/AutoIndent.py
+++ b/Tools/idle/AutoIndent.py
@@ -171,7 +171,7 @@ class AutoIndent:
expand, tabwidth = string.expandtabs, self.tabwidth
have = len(expand(chars, tabwidth))
assert have > 0
- want = int((have - 1) / self.indentwidth) * self.indentwidth
+ want = ((have - 1) // self.indentwidth) * self.indentwidth
ncharsdeleted = 0
while 1:
chars = chars[:-1]
@@ -495,7 +495,7 @@ def classifyws(s, tabwidth):
effective = effective + 1
elif ch == '\t':
raw = raw + 1
- effective = (effective / tabwidth + 1) * tabwidth
+ effective = (effective // tabwidth + 1) * tabwidth
else:
break
return raw, effective