diff --git a/tconfpy.py b/tconfpy.py index f9a3a0a..cef9438 100755 --- a/tconfpy.py +++ b/tconfpy.py @@ -6,7 +6,7 @@ # Program Information PROGNAME = "tconfpy" -RCSID = "$Id: tconfpy.py,v 1.127 2004/03/21 14:05:42 tundra Exp $" +RCSID = "$Id: tconfpy.py,v 1.128 2004/03/21 14:10:52 tundra Exp $" VERSION = RCSID.split()[2] # Copyright Information @@ -488,8 +488,7 @@ global CondStack, MsgList, SymTable, INLITERAL orig = line # May need copy of original for debug output - line = ConditionLine(line) - condstate = True # Results of conditional tests kept here + ########## # Beginning Of Line Parser @@ -500,9 +499,9 @@ # These get highest precedence because they block everything else. ##### - if line in (LITERAL, ENDLITERAL): + if line.strip() in (LITERAL, ENDLITERAL): - if line == LITERAL: + if line.strip() == LITERAL: INLITERAL = True else: @@ -529,6 +528,10 @@ return + + line = ConditionLine(line) # Strip out comments and leading/trailing whitespace + condstate = True # Results of conditional tests kept here + # Only attempt on non-blank lines for everything else if line: