scripts: minor extra line collapsing

4 files changed, 8 insertions, 16 deletions

diff --git a/pkgcore/scripts/filter_env.py b/pkgcore/scripts/filter_env.py
index 77f4fe434..1e3e8df63 100644
--- a/pkgcore/scripts/filter_env.py
+++ b/pkgcore/scripts/filter_env.py
@@ -27,13 +27,11 @@ argparser.add_argument(
     help='Filename to read the env from (uses stdin if omitted).')
 filtering = argparser.add_argument_group("Environment filtering options")
 filtering.add_argument(
-    '-V', '--var-match', action='store_true',
-    default=False,
+    '-V', '--var-match', action='store_true', default=False,
     help="Invert the filtering- instead of removing a var if it matches "
     "remove all vars that do not match")
 filtering.add_argument(
-    '-F', '--func-match', action='store_true',
-    default=False,
+    '-F', '--func-match', action='store_true', default=False,
     help="Invert the filtering- instead of removing a function if it matches "
     "remove all functions that do not match")
 filtering.add_argument(
diff --git a/pkgcore/scripts/pclonecache.py b/pkgcore/scripts/pclonecache.py
index aec934c75..0d64cc8d8 100644
--- a/pkgcore/scripts/pclonecache.py
+++ b/pkgcore/scripts/pclonecache.py
@@ -13,14 +13,12 @@ from pkgcore.util import commandline
 argparser = commandline.mk_argparser(
     domain=False, description=__doc__)
 argparser.add_argument(
-    "source", config_type='cache',
+    "source", config_type='cache', priority=20,
     action=commandline.StoreConfigObject,
-    priority=20,
     help="source cache to copy data from")
 argparser.add_argument(
-    "target", config_type='cache',
+    "target", config_type='cache', priority=21,
     action=commandline.StoreConfigObject, writable=True,
-    priority=21,
     help="target cache to update.  Must be writable.")
 
 
diff --git a/pkgcore/scripts/pconfig.py b/pkgcore/scripts/pconfig.py
index bba14afdf..7463ff19d 100644
--- a/pkgcore/scripts/pconfig.py
+++ b/pkgcore/scripts/pconfig.py
@@ -193,8 +193,7 @@ dump = subparsers.add_parser(
         'write a loadable config. There may be quoting issues.  With a '
         'typename argument only that type is dumped.'))
 dump.add_argument(
-    "typename", nargs="?", action="store",
-    default=None,
+    "typename", nargs="?", action="store", default=None,
     help="if specified, limit output to just config directives of this type"
          ".  If left off, all types are shown")
 @dump.bind_main_func
@@ -367,12 +366,10 @@ world_modes.add_argument(
     '-l', '--list', action='store_true',
     help="List the current world file contents for this domain.")
 world_modes.add_argument(
-    '-r', '--remove', action='append',
-    type=atom.atom,
+    '-r', '--remove', action='append', type=atom.atom,
     help="Remove an entry from the world file.  Can be specified multiple times.")
 world_modes.add_argument(
-    '-a', '--add', action='append',
-    type=atom.atom,
+    '-a', '--add', action='append', type=atom.atom,
     help="Add an entry to the world file.  Can be specified multiple times.")
 
 world.set_defaults(
diff --git a/pkgcore/scripts/pplugincache.py b/pkgcore/scripts/pplugincache.py
index 37153a1b0..a765a21ae 100644
--- a/pkgcore/scripts/pplugincache.py
+++ b/pkgcore/scripts/pplugincache.py
@@ -16,9 +16,8 @@ from pkgcore.util import commandline
 argparser = commandline.mk_argparser(
     config=False, domain=False, color=False, description=__doc__)
 argparser.add_argument(
-    "packages", nargs="*", action='store',
+    "packages", nargs="*", action='store', default=[plugins],
     type=partial(commandline.python_namespace_type, module=True),
-    default=[plugins],
     help="python namespace(s) to regenerate plugins for.  If none are "
          "specified, pkgcore.plugins is updated")