Merge branch 'master' into master

Author: davidblaszka

.gitignore

@@ -48,6 +48,7 @@ nosetests.xml
 coverage.xml
 *.cover
 .hypothesis/
+.pytest_cache/
 
 # Translations
 *.mo
@@ -84,14 +85,17 @@ celerybeat-schedule
 
 # dotenv
 .env
+*.csv
 
 # virtualenv
 .venv
 venv/
 ENV/
 vclassroom/
+advclassroom/
 edu-collections/
 
+
 # Spyder project settings
 .spyderproject
 .spyproject
@@ -107,4 +111,3 @@ edu-collections/
 
 # emacs
 *.*~
-

students/TracyA/session06/cigar_party.py

@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+# Programming in python B Winter 2018
+# March 11, 2018
+# Test cigar party test
+# Tracy Allen - git repo https://github.com/tenoverpar/Wi2018-Classroom
+
+"""
+When squirrels get together for a party, they like to have cigars.
+A squirrel party is successful when the number of cigars is between
+40 and 60, inclusive. Unless it is the weekend, in which case there
+is no upper bound on the number of cigars.
+Return True if the party with the given values is successful,
+or False otherwise.
+"""
+
+
+def cigar_party(cigars, is_weekend):
+    if is_weekend:
+        return (cigars >= 40)
+    else:
+        return (cigars >= 40 and cigars <= 60)

students/TracyA/session06/kwargs_lab.py

@@ -0,0 +1,89 @@
+#!/usr/bin/env python
+from collections import OrderedDict
+
+
+# Programming in python B Winter 2018
+# March 11, 2018
+# Kwargs lab
+# Tracy Allen - git repo https://github.com/tenoverpar/Wi2018-Classroom
+
+
+"""
+call_colors() is a function that takes totaly generic arguments
+the test code calls it in various ways so you can confirm it works as expected.
+
+colors_manual() takes generic arguments, but processes it as if it
+  had keyworkd parameters.
+"""
+
+
+def colors(fore_color='red',
+           back_color='blue',
+           link_color='green',
+           visited_color='cyan'):
+
+    output = ("The colors are: \n"
+              "    foreground:  {fore_color}\n"
+              "    background:  {back_color}\n"
+              "    link:  {link_color}\n"
+              "    visited:  {visited_color}")
+    output = output.format(fore_color=fore_color,
+                           back_color=back_color,
+                           link_color=link_color,
+                           visited_color=visited_color)
+
+    return output
+
+
+def call_colors(*args, **kwargs):
+    """
+    So this function will simpily return args and kwargs, and the test.
+
+    *args and **kwargs should be saved for times when you NEED generic
+    function processing.
+    """
+    return args, kwargs
+
+
+def colors_manual(*args, **kwargs):
+    """
+    This example to show you how much work you need to do to do this by hand!
+
+    """
+    default_colors = OrderedDict((('fore_color', 'red'),
+                                  ('back_color', 'blue'),
+                                  ('link_color', 'green'),
+                                  ('visited_color', 'cyan')))
+
+    for key in kwargs:
+        if key not in default_colors:
+            msg = "colors_manual() got an expcted keyword argument: {}".format(key)
+            raise TypeError
+
+    all_args = {}
+    # uppacking now
+    for i, key in enumerate(default_colors.keys()):
+        try:
+            all_args[key] = args[i]
+        except IndexError:
+            break
+
+    for key, color in default_colors.items():
+        if key in all_args:
+            if key in kwargs:
+                msg = "colors_manual() go mult values for argument '{}'".format(key)
+                raise TypeError(msg)
+            elif key in kwargs:
+                # from the dictionary
+                all_args[key] = kwargs[key]
+            else:
+                all_args[key] = color
+
+    output = ("The colors are:\n"
+              "  foreground: {fore_color}\n"
+              "  back_color: {back_color}\n"
+              "  link:  {link_color}\n"
+              "  visited:  {visited_color}")
+    output = output.format(**all_args)
+
+    return output

students/TracyA/session05/mailroom_session05.py students/TracyA/session06/mailroom_session06.py

@@ -8,11 +8,11 @@
 # Tracy Allen - git repo https://github.com/tenoverpar/Wi2018-Classroom
 
 
-donor_data = {"Allen, Paul": [1000000, 50000, 300000],
-              "Gates, Bill": [5000000, 80000, 700000],
-              "Warren, Buffett": [30000, 30000, 40000],
-              "Musk, Elon": [1000000, 30000],
-              "Zuckerberg, Mark": [10000, 50000, 12000, 400000]}
+donor_data = {"Allen, Paul": [1000000.00, 50000.00, 300000.00],
+              "Gates, Bill": [5000000.00, 80000.00, 700000.00],
+              "Warren, Buffett": [30000.00, 30000.00, 40000.00],
+              "Musk, Elon": [1000000.00, 30000.00],
+              "Zuckerberg, Mark": [10000.00, 50000.00, 12000.00, 400000.00]}
 
 
 # Donor data comprehension
@@ -60,16 +60,15 @@ def make_donor_dict(name, amount):
 
 def donor_selection():
     name = input("Please enter a donor's name in the form "
-                 "of 'Last Name, First name' or 'list' to see a list of donors"
-                 " or menu to exit > ").title()
+                 "of 'Last Name, First name'. \n Enter 'list' to see a list of "
+                 "donors or 'menu' to exit > ").title()
     return name
 
 
 def get_donor_name():
     """Attempt to break up and handle exceptions"""
     while True:
         name = donor_selection()
-        print(">>>> name2", name)
         if name == "List":
             show_list()
         elif name == "Menu":
@@ -104,29 +103,6 @@ def get_donation_amount():
                 return amount
 
 
-# def add_donor_info(name, donor_db):
-#     """ Add donor info or add a new donor
-#     :params: name/string/name of donor db key, donor_db: dictionary of
-#     donor names/amts.
-#         :return:
-#     """
-#     if name == "list" or name == "menu":
-#         print('Please select a name other than list or menu.')
-#         return 12
-#     if name not in donor_db:
-#         "create a name in the donor_db if it does not already exist"
-#         donor_db.update({name.lower(): []})
-#
-#     try:
-#         amount = input("Enter amount of donor's contribution "
-#                        "(or 'list' to see all donors or 'menu' to exit)> ").strip()
-#         donor_db[name].append(float(amount))
-#     except ValueError:
-#         print("\nPlease resubmit a the donor amount information in \
-#             dollars and cents with a format matching: 10.11\n")
-#     return
-
-
 def split_name(name):
     """ I can now split the names into first and last name"""
     first_name = name.split(",")[1].strip()
@@ -173,34 +149,6 @@ def send_donor_email():
     print(make_donor_email(donor_dict))
 
 
-#     while True:
-#         name = input("Please enter a donor's name in the form of \
-#          'Last name, First name' "
-#                      "(or 'list' to see a list of all donors, \
-#                      or 'menu' to exit)> ").strip()
-#         if name == "list":
-#             show_list()
-#         elif name == "menu":
-#             return None
-#         else:
-#             break
-#     while True:
-#         amount_str = input("Please enter a donation amount \
-#          (or 'menu' to exit)> ").strip()
-#         if amount_str == "menu":
-#             return None
-#         else:
-#             amount = float(amount_str)
-#         donor = get_donor(name)
-#         if donor is None:
-#             donor_data.setdefault(name, [])
-#             donor_dict["first name"], donor_dict["last name"] = split_name(name)
-#         donor_data[name].append(amount)
-#         donor_dict["amt"] = amount
-#         break
-#     print(make_donor_email(donor_dict))
-
-
 def sort_key(item):
     """ key function used to sort the list by first (not zeroth) item"""
     return item[1]
@@ -212,18 +160,31 @@ def quit_program():
 
 
 def make_report():
-    """print the people to the screen"""
-    rows = []
+    """Generate the report of the donors and amounts donated.
+    :returns: the donor report as a string.
+    """
+    # First, reduce the raw data into a summary list view
+    report_rows = []
     for donor in donor_data:
         total = sum(donor_data[donor])
         num = len(donor_data[donor])
         avg = total / num
-        rows.append((donor, total, num, avg))
-    rows.sort(key=sort_key, reverse=True)
-    print("{:20s}{:15s}{:15s}{:12s}".format(
-        "Donor Name", "|  Total Given", "|  Num Gifts", "|  Average Gift"))
-    print("_" * 67)
-    [print('{:20s}{:15.2f}{:^15d}{:12.2f}'.format(*row)) for row in rows]
+        report_rows.append((donor, total, num, avg))
+
+    # sort the report data
+    report_rows.sort(key=sort_key, reverse=True)
+    report = []
+    report.append("{:20s} | {:11s} | {:15s} | {:12s}".format(
+        "Donor Name", "Total Given", "Num Gifts", "Average Gift"))
+
+    report.append("-" * 67)
+    for row in report_rows:
+        report.append("{:20s}${:15.2f}{:^15d}${:12.2f}".format(*row))
+    return "\n".join(report)
+
+
+def print_donor_report():
+    print(make_report())
 
 
 def init_prompt():
@@ -234,20 +195,18 @@ def init_prompt():
         '3' - Send letters to everyone
         '4' - Quit
         > ''')
-    print(">>>>>> answer", answer)
     return answer
 
 
 if __name__ == "__main__":
     running = True
 
     dispatch_dictionary = {"1": send_donor_email,
-                           "2": make_report,
+                           "2": print_donor_report,
                            "3": create_letter_files,
                            "4": quit_program}
     while running:
         response = init_prompt()
-        print(">>>> response", response)
         try:
             dispatch_dictionary[response]()
         except KeyError:

students/TracyA/session06/test_cigar_party.py

@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+# Programming in python B Winter 2018
+# February 21 2017
+# Test cigar party script
+# Tracy Allen - git repo https://github.com/tenoverpar/Wi2018-Classroom
+
+"""
+When squirrels get together for a party, they like to have cigars.
+A squirrel party is successful when the number of cigars is between
+40 and 60, inclusive. Unless it is the weekend, in which case there
+is no upper bound on the number of cigars.
+Return True if the party with the given values is successful,
+or False otherwise.
+"""
+
+
+# you can change this import to test different versions
+from cigar_party import cigar_party
+# from cigar_party import cigar_party2 as cigar_party
+# from cigar_party import cigar_party3 as cigar_party
+
+
+def test_1():
+    assert cigar_party(41, False) is True
+
+
+def test_2():
+    assert cigar_party(50, False) is True
+
+
+def test_3():
+    assert cigar_party(70, True) is True
+
+
+def test_4():
+    assert cigar_party(30, True) is False
+
+
+def test_5():
+    assert cigar_party(50, True) is True
+
+
+def test_6():
+    assert cigar_party(60, False) is True
+
+
+def test_7():
+    assert cigar_party(61, False) is False
+
+
+def test_8():
+    assert cigar_party(40, False) is True
+
+
+def test_9():
+    assert cigar_party(39, False) is False
+
+
+def test_10():
+    assert cigar_party(40, True) is True
+
+
+def test_11():
+    assert cigar_party(39, True) is False