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

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Apr  2 07:08:35 2010
New Revision: 177

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=177
Log:
Use str().format() instead of old style string formatting

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

Modified: asterisk/trunk/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/asterisk.py?view=diff&rev=177&r1=176&r2=177
==============================================================================
--- asterisk/trunk/lib/python/asterisk/asterisk.py (original)
+++ asterisk/trunk/lib/python/asterisk/asterisk.py Fri Apr  2 07:08:35 2010
@@ -66,11 +66,12 @@
         # Choose an install base
         self.base = base
         if self.base is None:
-            self.base = "%s/tmp" % os.getcwd()
+            self.base = "{0}/tmp".format(os.getcwd())
         i = 1
         while True:
-            if not os.path.isdir("%s/ast%d" % (self.base, i)):
-                self.base = "%s/ast%d" % (self.base, i)
+            d = "{0}/ast{1}".format(self.base, i)
+            if not os.path.isdir(d):
+                self.base = d
                 break
             i += 1
         os.makedirs(self.base)
@@ -98,7 +99,7 @@
         cmd = [
             "asterisk",
             "-f", "-g", "-q", "-m",
-            "-C", "%s" % os.path.join(self.astetcdir, "asterisk.conf")
+            "-C", os.path.join(self.astetcdir, "asterisk.conf")
         ]
         self.process = subprocess.Popen(cmd)
         time.sleep(5.0)
@@ -139,7 +140,7 @@
         asterisk.install_config("tests/my-cool-test/configs/manager.conf")
         """
         if not os.path.exists(cfg_path):
-            print "Config file '%s' does not exist" % cfg_path
+            print "Config file '{0}' does not exist".format(cfg_path)
             return
         if not self.astetcdir:
             print "Don't know where to put local config!"
@@ -150,9 +151,9 @@
         try:
             shutil.copyfile(cfg_path, target_path)
         except shutil.Error:
-            print "'%s' and '%s' are the same file" % (cfg_path, target_path)
+            print "'{0}' and '{1}' are the same file".format(cfg_path, target_path)
         except IOError:
-            print "The destination is not writable '%s'" % target_path
+            print "The destination is not writable '{0}'".format(target_path)
 
     def cli_exec(self, cli_cmd):
         """Execute a CLI command on this instance of Asterisk.
@@ -165,10 +166,10 @@
         """
         cmd = [
             "asterisk",
-            "-C", "%s" % os.path.join(self.astetcdir, "asterisk.conf"),
-            "-rx", "%s" % cli_cmd
+            "-C", os.path.join(self.astetcdir, "asterisk.conf"),
+            "-rx", cli_cmd
         ]
-        print "Executing %s ..." % cmd
+        print "Executing {0} ...".format(cmd)
         process = subprocess.Popen(cmd)
         process.wait()
 
@@ -176,7 +177,7 @@
         self.astetcdir = None
         for (var, val) in dir_cat.options:
             if var == "astetcdir":
-                self.astetcdir = "%s%s" % (self.base, val)
+                self.astetcdir = "{0}{1}".format(self.base, val)
                 os.makedirs(self.astetcdir)
 
         if self.astetcdir is None:
@@ -188,20 +189,20 @@
         try:
             f = open(local_ast_conf_path, "w")
         except IOError:
-            print "Failed to open %s" % local_ast_conf_path
+            print "Failed to open {0}".format(local_ast_conf_path)
             return
         except:
-            print "Unexpected error: %s" % sys.exc_info()[0]
+            print "Unexpected error: {0}".format(sys.exc_info()[0])
             return
 
         for c in ast_conf.categories:
-            f.write("[%s]\n\n" % c.name)
+            f.write("[{0}]\n\n".format(c.name))
             if c.name == "directories":
                 for (var, val) in c.options:
-                    f.write("%s = %s%s\n" % (var, self.base, val))
+                    f.write("{0} = {1}{2}\n".format(var, self.base, val))
             else:
                 for (var, val) in c.options:
-                    f.write("%s = %s\n" % (var, val))
+                    f.write("{0} = {1}\n".format(var, val))
             f.write("\n")
 
         f.close()
@@ -214,15 +215,15 @@
         blacklist = [ "astdb" ]
         for dirname, dirnames, filenames in os.walk(ast_dir_path):
             for filename in filenames:
-                target = "%s/%s" % (self.base, os.path.join(ast_dir_path,
-                                    dirname, filename))
+                target = "{0}/{1}".format(self.base, os.path.join(ast_dir_path,
+                                                     dirname, filename))
                 if os.path.exists(target) or filename in blacklist:
                     continue
                 os.symlink(os.path.join(ast_dir_path, dirname, filename),
                            target)
 
     def __makedirs(self, ast_dir_path):
-        target_dir = "%s%s" % (self.base, ast_dir_path)
+        target_dir = "{0}{1}".format(self.base, ast_dir_path)
         if not os.path.exists(target_dir):
             os.makedirs(target_dir)
         for dirname, dirnames, filenames in os.walk(ast_dir_path):