noise

3 files changed, 8 insertions, 9 deletions

diff --git a/python/londiste.py b/python/londiste.py
index e95fa25d..272b824c 100755
--- a/python/londiste.py
+++ b/python/londiste.py
@@ -86,7 +86,7 @@ class Londiste(skytools.DBScript):
         londiste.Replicator(self.full_args)
 
     def init_optparse(self, parser=None):
-        p = skytools.DBScript.init_optparse(self, parser)
+        p = super(Londiste, self).init_optparse(parser)
         p.set_usage(command_usage.strip())
 
         g = optparse.OptionGroup(p, "options for cascading")
@@ -105,6 +105,7 @@ class Londiste(skytools.DBScript):
         g.add_option("--sync-watermark",
                 help = "create-branch: list of node names to sync wm with")
         p.add_option_group(g)
+
         g = optparse.OptionGroup(p, "repair queue position")
         g.add_option("--rewind", action = "store_true",
                 help = "change queue position according to destination")
@@ -149,7 +150,7 @@ class Londiste(skytools.DBScript):
                 help="max number of parallel copy processes")
         p.add_option_group(g)
 
-        g = optparse.OptionGroup(p, "other options options")
+        g = optparse.OptionGroup(p, "other options")
         g.add_option("--force", action="store_true",
                 help = "add: ignore table differences, repair: ignore lag")
         g.add_option("--apply", action = "store_true",
diff --git a/python/pgq/cascade/admin.py b/python/pgq/cascade/admin.py
index 9e789fb1..200a1015 100644
--- a/python/pgq/cascade/admin.py
+++ b/python/pgq/cascade/admin.py
@@ -29,7 +29,6 @@ Node Initialization:
   create-leaf   NAME PUBLIC_CONNSTR --provider=<public_connstr>
     Initializes node.
 
-
 Node Administration:
   pause                 Pause node worker.
   resume                Resume node worker.
@@ -54,11 +53,9 @@ Cascade layout change:
 
   tag-alive NODE ..
     Tag node as alive
-
 """
 
 standalone_usage = """
-
 setadm extra switches:
 
   pause/resume/change-provider:
@@ -88,8 +85,8 @@ class CascadeAdmin(skytools.AdminScript):
         """Add SetAdmin switches to parser."""
         p = skytools.AdminScript.init_optparse(self, parser)
 
-        usage = command_usage.strip() + standalone_usage
-        p.set_usage(usage)
+        usage = command_usage + standalone_usage
+        p.set_usage(usage.strip())
 
         g = optparse.OptionGroup(p, "actual queue admin options")
         g.add_option("--connstr", action="store_true",
diff --git a/python/skytools/scripting.py b/python/skytools/scripting.py
index fd7805d8..23c3ef56 100644
--- a/python/skytools/scripting.py
+++ b/python/skytools/scripting.py
@@ -381,11 +381,11 @@ class BaseScript(object):
         parse command line arguments.
 
         Note that it can be overridden both directions - either DBScript
-        will initialize a instance and passes to user code or user can
+        will initialize an instance and pass it to user code or user can
         initialize and then pass to DBScript.init_optparse().
 
         @param parser: optional OptionParser() instance,
-               where DBScript should attachs its own arguments.
+               where DBScript should attach its own arguments.
         @return: initialized OptionParser() instance.
         """
         if parser:
@@ -393,6 +393,7 @@ class BaseScript(object):
         else:
             p = optparse.OptionParser()
             p.set_usage("%prog [options] INI")
+
         # generic options
         p.add_option("-q", "--quiet", action="store_true",
                      help = "log only errors and warnings")