summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-10-04 20:19:21 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-10-04 20:19:21 (GMT)
commit6e8c75755a1bb0cd8fb79944a8617802aa0c4e44 (patch)
tree03d732d40f80da6edce6c895d0876c5add347e59 /Tools
parent23c5050b25be66646af4d8a8fc2f9338a51e226a (diff)
downloadcpython-6e8c75755a1bb0cd8fb79944a8617802aa0c4e44.zip
cpython-6e8c75755a1bb0cd8fb79944a8617802aa0c4e44.tar.gz
cpython-6e8c75755a1bb0cd8fb79944a8617802aa0c4e44.tar.bz2
Merged revisions 74865,75175,75180 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74865 | georg.brandl | 2009-09-17 02:49:37 -0500 (Thu, 17 Sep 2009) | 1 line #6912: add "with" block support to pindent. ........ r75175 | georg.brandl | 2009-10-01 15:11:14 -0500 (Thu, 01 Oct 2009) | 1 line Fix some weird whitespace and two other overlong lines. ........ r75180 | georg.brandl | 2009-10-01 15:59:31 -0500 (Thu, 01 Oct 2009) | 1 line #7031: Add TestCase.assertIsInstance and negated method. ........
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/scripts/pindent.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/scripts/pindent.py b/Tools/scripts/pindent.py
index 3f3000d..f80a8b7 100755
--- a/Tools/scripts/pindent.py
+++ b/Tools/scripts/pindent.py
@@ -88,10 +88,10 @@ next = {}
next['if'] = next['elif'] = 'elif', 'else', 'end'
next['while'] = next['for'] = 'else', 'end'
next['try'] = 'except', 'finally'
-next['except'] = 'except', 'else', 'end'
+next['except'] = 'except', 'else', 'finally', 'end'
next['else'] = next['finally'] = next['def'] = next['class'] = 'end'
next['end'] = ()
-start = 'if', 'while', 'for', 'try', 'def', 'class'
+start = 'if', 'while', 'for', 'try', 'with', 'def', 'class'
class PythonIndenter: