[SCM] morituri/master: * morituri/rip/cd.py: Use %default in options description.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bdbd7768ebf6c1280cd451b12688ec391534195c
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Tue May 31 08:27:44 2011 +0000

    	* morituri/rip/cd.py:
    	  Use %default in options description.

diff --git a/ChangeLog b/ChangeLog
index b31f11d..8c11acc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2011-05-31  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/rip/cd.py:
+	  Use %default in options description.
+
+2011-05-31  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/rip/cd.py:
 	  Ouch, was using the DISC TEMPLATE for the tracks.
 
 2011-05-30  Thomas Vander Stichele  <thomas at apestaart dot org>
diff --git a/morituri/rip/cd.py b/morituri/rip/cd.py
index 9768401..2c9be7f 100644
--- a/morituri/rip/cd.py
+++ b/morituri/rip/cd.py
@@ -74,13 +74,11 @@ filling in the variables and expanding the file extension. Variables are:
         # FIXME: get from config
         self.parser.add_option('', '--track-template',
             action="store", dest="track_template",
-            help="template for track file naming (default %s)" %
-                DEFAULT_TRACK_TEMPLATE,
+            help="template for track file naming (default %default)",
             default=DEFAULT_TRACK_TEMPLATE)
         self.parser.add_option('', '--disc-template',
             action="store", dest="disc_template",
-            help="template for disc file naming (default %s)" %
-                DEFAULT_DISC_TEMPLATE,
+            help="template for disc file naming (default %default)",
             default=DEFAULT_DISC_TEMPLATE)
         default = 'flac'
 

-- 
morituri packaging