diff options
| -rwxr-xr-x | Lib/tabnanny.py | 12 | ||||
| -rwxr-xr-x | Tools/idle/tabnanny.py | 12 | ||||
| -rwxr-xr-x | Tools/scripts/tabnanny.py | 12 |
3 files changed, 27 insertions, 9 deletions
diff --git a/Lib/tabnanny.py b/Lib/tabnanny.py index 6dca8af..a9bd9dc 100755 --- a/Lib/tabnanny.py +++ b/Lib/tabnanny.py @@ -2,9 +2,9 @@ """The Tab Nanny despises ambiguous indentation. She knows no mercy.""" -# Released to the public domain, by Tim Peters, 6 April 1998. +# Released to the public domain, by Tim Peters, 15 April 1998. -__version__ = "4" +__version__ = "5" import os import sys @@ -270,7 +270,13 @@ if hasattr(tokenize, 'NL'): # that when the run of DEDENTs ends, the indentation of the # program statement (or ENDMARKER) that triggered the run is # equal to what's left at the top of the indents stack - assert check_equal # else no earlier NEWLINE, or an earlier INDENT + + # Ouch! This assert triggers if the last line of the source + # is indented *and* lacks a newline -- then DEDENTs pop out + # of thin air. + # assert check_equal # else no earlier NEWLINE, or an earlier INDENT + check_equal = 1 + del indents[-1] elif check_equal and type not in JUNK: diff --git a/Tools/idle/tabnanny.py b/Tools/idle/tabnanny.py index 6dca8af..a9bd9dc 100755 --- a/Tools/idle/tabnanny.py +++ b/Tools/idle/tabnanny.py @@ -2,9 +2,9 @@ """The Tab Nanny despises ambiguous indentation. She knows no mercy.""" -# Released to the public domain, by Tim Peters, 6 April 1998. +# Released to the public domain, by Tim Peters, 15 April 1998. -__version__ = "4" +__version__ = "5" import os import sys @@ -270,7 +270,13 @@ if hasattr(tokenize, 'NL'): # that when the run of DEDENTs ends, the indentation of the # program statement (or ENDMARKER) that triggered the run is # equal to what's left at the top of the indents stack - assert check_equal # else no earlier NEWLINE, or an earlier INDENT + + # Ouch! This assert triggers if the last line of the source + # is indented *and* lacks a newline -- then DEDENTs pop out + # of thin air. + # assert check_equal # else no earlier NEWLINE, or an earlier INDENT + check_equal = 1 + del indents[-1] elif check_equal and type not in JUNK: diff --git a/Tools/scripts/tabnanny.py b/Tools/scripts/tabnanny.py index 6dca8af..a9bd9dc 100755 --- a/Tools/scripts/tabnanny.py +++ b/Tools/scripts/tabnanny.py @@ -2,9 +2,9 @@ """The Tab Nanny despises ambiguous indentation. She knows no mercy.""" -# Released to the public domain, by Tim Peters, 6 April 1998. +# Released to the public domain, by Tim Peters, 15 April 1998. -__version__ = "4" +__version__ = "5" import os import sys @@ -270,7 +270,13 @@ if hasattr(tokenize, 'NL'): # that when the run of DEDENTs ends, the indentation of the # program statement (or ENDMARKER) that triggered the run is # equal to what's left at the top of the indents stack - assert check_equal # else no earlier NEWLINE, or an earlier INDENT + + # Ouch! This assert triggers if the last line of the source + # is indented *and* lacks a newline -- then DEDENTs pop out + # of thin air. + # assert check_equal # else no earlier NEWLINE, or an earlier INDENT + check_equal = 1 + del indents[-1] elif check_equal and type not in JUNK: |