From 9cd818a2bf30e4a808593b540bc68bee46f066b1 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Apr 03 2016 18:58:23 +0000
Subject: Some simplifications


---

diff --git a/spectool b/spectool
index e05c807..9772451 100755
--- a/spectool
+++ b/spectool
@@ -41,12 +41,8 @@ class CompletedProcess(object):
 class ProcError(CalledProcessError):
     """A CalledProcessError that also has stderr and stdout, like py3.5's."""
     def __init__(self, args, returncode, **kwargs):
-        self.stderr = None
-        self.stdout = None
-        if 'stderr' in kwargs:
-            self.stderr = kwargs['stderr']
-        if 'stdout' in kwargs:
-            self.stdout = kwargs['stdout']
+        self.stdout = kwargs.get('stdout', None)
+        self.stderr = kwargs.get('stderr', None)
         super().__init__(returncode, args, self.stderr)
 
     def __str__(self):
@@ -207,9 +203,9 @@ def parseopts():
 
     mode = parser.add_argument_group('Operating mode')
     mode1 = mode.add_mutually_exclusive_group()
-    mode1.add_argument('-l', '--lf', '--list-files', action='store_true', dest='listfiles',
+    mode1.add_argument('-l', '--list-files', '--lf', action='store_true',
             help='lists the expanded sources/patches (default)')
-    mode1.add_argument('-g', '--gf', '--get-files', action='store_true', dest='getfiles',
+    mode1.add_argument('-g', '--get-files', '--gf', action='store_true',
             help='gets the sources/patches that are listed with a URL')
     mode.add_argument('-h', '--help', action='help',
             help="display this help screen")
@@ -333,7 +329,7 @@ def generate_asset_list(spec, opts, selected):
         else:
             yield 'Error', patch, 'No patch item {}'.format(patch)
 
-def listfiles(spec, opts, selected):
+def list_files(spec, opts, selected):
     for typ, num, asset in generate_asset_list(spec, opts, selected):
         if typ == 'Error':
             print(asset)
@@ -393,10 +389,9 @@ def main():
         show_parsed_data(spec, opts)
 
     selected = Selections(spec, opts)
-    if not opts.getfiles or opts.listfiles:
-        listfiles(spec, opts, selected)
-
-    if opts.getfiles:
+    if opts.list_files or not opts.get_files:
+        list_files(spec, opts, selected)
+    if opts.get_files:
         download_files(spec, opts, selected)