diff --git a/tconfpy.py b/tconfpy.py index c1872ad..e5f7fa0 100755 --- a/tconfpy.py +++ b/tconfpy.py @@ -6,7 +6,7 @@ # Program Information PROGNAME = "tconfpy" -RCSID = "$Id: tconfpy.py,v 1.100 2004/03/09 08:00:01 tundra Exp $" +RCSID = "$Id: tconfpy.py,v 1.101 2004/03/09 08:14:04 tundra Exp $" VERSION = RCSID.split()[2] # Copyright Information @@ -17,7 +17,7 @@ RIGHTS = "All Rights Reserved" COPYRIGHT = "Copyright %s %s %s, %s." % (CPRT, DATE, OWNER, RIGHTS) PROGINFO = PROGNAME + " " + VERSION -BANNER = "%s - %s" % (PROGINFO, COPYRIGHT) +BANNER = "%s\n%s" % (PROGINFO, COPYRIGHT) #----------------------------------------------------------# @@ -52,7 +52,7 @@ # Constants ########## -MSGCOL = 10 # Column to start message output +MSGPOS = 10 # Where to start message output ########## # Literals @@ -76,7 +76,7 @@ ########## iERRTST = "Test Error Message - Ignore" -iWARNTST = "Test Warning Message Ignore" +iWARNTST = "Test Warning Message - Ignore" ########## @@ -130,11 +130,11 @@ def mkmsg(msg, msgtype=""): if msgtype: - sep = ":" + msgtype += ":" + + pad = " " * (MSGPOS - len(msgtype)) - pad = " " * (MSGCOL - len(msgtype)) - - return "%s - %s%s%s%s" % (PROGINFO, msgtype,sep, pad, msg) + return "%s - %s%s%s" % (PROGINFO, msgtype, pad, msg) # End of 'mkmsg()' @@ -156,7 +156,7 @@ if __name__ == '__main__': - print BANNER + print BANNER + '\n' print ErrorMsg(iERRTST) print WarningMsg(iWARNTST)