fixed solutions

kyclark · kyclark · commit bf371d16c99e · 2020-03-30T14:52:22.000-07:00
diff --git a/07_gashlycrumb/gashlycrumb_interactive.py b/07_gashlycrumb/gashlycrumb_interactive.py
@@ -9,7 +9,7 @@ def get_args():
     """get command-line arguments"""
 
     parser = argparse.ArgumentParser(
-        description='Gashlycrumb',
+        description='Interactive Gashlycrumb',
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
     parser.add_argument('-f',
@@ -35,10 +35,8 @@ def main():
         if letter == '!':
             print('Bye')
             break
-        elif letter.upper() in lookup:
-            print(lookup[letter.upper()])
-        else:
-            print('I do not know "{}".'.format(letter))
+
+        print(lookup.get(letter.upper(), f'I do not know "{letter}".'))
 
 
 # --------------------------------------------------
diff --git a/07_gashlycrumb/solution1.py b/07_gashlycrumb/solution1.py
@@ -14,14 +14,14 @@ def get_args():
 
     parser.add_argument('letter',
                         help='Letter(s)',
-                        metavar='str',
+                        metavar='letter',
                         nargs='+',
                         type=str)
 
     parser.add_argument('-f',
                         '--file',
                         help='Input file',
-                        metavar='str',
+                        metavar='FILE',
                         type=argparse.FileType('r'),
                         default='gashlycrumb.txt')
 
@@ -33,7 +33,10 @@ def main():
     """Make a jazz noise here"""
 
     args = get_args()
-    lookup = {line[0].upper(): line.rstrip() for line in args.file}
+
+    lookup = {}
+    for line in args.file:
+        lookup[line[0].upper()] = line.rstrip()
 
     for letter in args.letter:
         if letter.upper() in lookup:
diff --git a/07_gashlycrumb/solution2_dict_comp.py b/07_gashlycrumb/solution2_dict_comp.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+"""Lookup tables"""
+
+import argparse
+
+
+# --------------------------------------------------
+def get_args():
+    """get command-line arguments"""
+
+    parser = argparse.ArgumentParser(
+        description='Gashlycrumb',
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+
+    parser.add_argument('letter',
+                        help='Letter(s)',
+                        metavar='letter',
+                        nargs='+',
+                        type=str)
+
+    parser.add_argument('-f',
+                        '--file',
+                        help='Input file',
+                        metavar='FILE',
+                        type=argparse.FileType('r'),
+                        default='gashlycrumb.txt')
+
+    return parser.parse_args()
+
+
+# --------------------------------------------------
+def main():
+    """Make a jazz noise here"""
+
+    args = get_args()
+    lookup = {line[0].upper(): line.rstrip() for line in args.file}
+
+    for letter in args.letter:
+        if letter.upper() in lookup:
+            print(lookup[letter.upper()])
+        else:
+            print(f'I do not know "{letter}".')
+
+
+# --------------------------------------------------
+if __name__ == '__main__':
+    main()
diff --git a/07_gashlycrumb/solution3_dict_get.py b/07_gashlycrumb/solution3_dict_get.py
@@ -14,14 +14,14 @@ def get_args():
 
     parser.add_argument('letter',
                         help='Letter(s)',
-                        metavar='str',
+                        metavar='letter',
                         nargs='+',
                         type=str)
 
     parser.add_argument('-f',
                         '--file',
                         help='Input file',
-                        metavar='str',
+                        metavar='FILE',
                         type=argparse.FileType('r'),
                         default='gashlycrumb.txt')
 
