[svn-commits] russell: testsuite/asterisk/trunk r175 - /asterisk/trunk/lib/python/asterisk/

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Apr  2 06:57:07 2010
New Revision: 175

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=175
Log:
Use str().format(), show when a category was a template in test code

Modified:
    asterisk/trunk/lib/python/asterisk/config.py

Modified: asterisk/trunk/lib/python/asterisk/config.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/config.py?view=diff&rev=175&r1=174&r2=175
==============================================================================
--- asterisk/trunk/lib/python/asterisk/config.py (original)
+++ asterisk/trunk/lib/python/asterisk/config.py Fri Apr  2 06:57:07 2010
@@ -49,7 +49,7 @@
         match = self.varval_re.match(line)
         if match is None:
             if not is_blank_line(line):
-                print "Invalid line: '%s'" % line.strip()
+                print "Invalid line: '{0}'".format(line.strip())
             return
         self.options.append((match.group("name"), match.group("value").strip()))
 
@@ -80,10 +80,10 @@
                 config_str = f.read()
                 f.close()
             except IOError:
-                print "Failed to open config file '%s'" % fn
+                print "Failed to open config file '{0}'".format(fn)
                 return
             except:
-                print "Unexpected error: %s" % sys.exc_info()[0]
+                print "Unexpected error: {0}".format(sys.exc_info()[0])
                 return
 
         config_str = self.strip_mline_comments(config_str)
@@ -103,7 +103,7 @@
             )
         elif len(self.categories) == 0:
             if not is_blank_line(line):
-                print "Invalid line: '%s'" % line.strip()
+                print "Invalid line: '{0}'".format(line.strip())
         else:
             self.categories[-1].parse_line(line)
 
@@ -178,9 +178,12 @@
     if len(argv) == 2:
         conf = ConfigFile(argv[1])
         for c in conf.categories:
-            print "[%s]" % c.name
+            t = ""
+            if c.template:
+                t = "(!)"
+            print "[{0}]{1}".format(c.name, t)
             for (var, val) in c.options:
-                print "%s = %s" % (var, val)
+                print "{0} = {1}".format(var, val)
     else:
         return unittest.main()