diff --git a/tconfpy.py b/tconfpy.py index 2910ac4..0476b4f 100755 --- a/tconfpy.py +++ b/tconfpy.py @@ -6,7 +6,7 @@ # Program Information PROGNAME = "tconfpy" -RCSID = "$Id: tconfpy.py,v 1.109 2004/03/12 10:14:02 tundra Exp $" +RCSID = "$Id: tconfpy.py,v 1.110 2004/03/13 00:19:04 tundra Exp $" VERSION = RCSID.split()[2] # Copyright Information @@ -134,17 +134,20 @@ ########## dDEBUG = "DEBUG" -dLINEIGNORE = FILENUM + " Line Ignored/Not Included" + PTR + "%s\n" + +dBLANKLINE = "(Parsed To Blank Line - Ignored)" +dLINEIGNORE = FILENUM + " Line Ignored/Not Included" + PTR + "'%s'\n" dNUMLINES = "Processing File '%s' Resulted In %d Total Lines Parsed" -dPARSEDLINE = FILENUM + " %s" + PTR + "%s\n" +dPARSEDLINE = FILENUM + " '%s'" + PTR + "'%s'\n" ########### # Error Messages ########### +eERROR = "ERROR" + eCONFOPEN = "Cannot Open The File '%s'" eENDIFEXTRA = FILENUM + " " + ENDIF + " Without Matching Condition" -eERROR = "ERROR" ########### @@ -156,9 +159,10 @@ # Warning Messages ########### -wENDIFBAD = FILENUM + " Text After " + ENDIF + " Ignored" wWARNING = "WARNING" +wENDIFBAD = FILENUM + " Text After " + ENDIF + " Ignored" + #--------------------------- Code Begins Here ---------------------------------# @@ -373,7 +377,7 @@ if not CondStack[-1]: if DEBUG: - DebugMsg(dLINEIGNORE %(cfgfile, linenum, orig)) + DebugMsg(dLINEIGNORE % (cfgfile, linenum, orig)) return ##### @@ -391,12 +395,17 @@ for ref in Reserved.keys(): line = line.replace("%s%s%s" % (DELIML, ref, DELIMR), Reserved[ref]) - + ########## # End Of Line Parser ########## if DEBUG: + + # Note blank lines for debug purposes + if not line: + line = dBLANKLINE + DebugMsg(dPARSEDLINE %(cfgfile, linenum, orig, line)) # End of 'ParseLine'