diff --git a/students/KevinCavanaugh/final_project/.idea/encodings.xml b/students/KevinCavanaugh/final_project/.idea/encodings.xml
new file mode 100644
index 0000000..15a15b2
--- /dev/null
+++ b/students/KevinCavanaugh/final_project/.idea/encodings.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/final_project/.idea/final_project.iml b/students/KevinCavanaugh/final_project/.idea/final_project.iml
new file mode 100644
index 0000000..85c7612
--- /dev/null
+++ b/students/KevinCavanaugh/final_project/.idea/final_project.iml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/final_project/.idea/misc.xml b/students/KevinCavanaugh/final_project/.idea/misc.xml
new file mode 100644
index 0000000..8d0e8a5
--- /dev/null
+++ b/students/KevinCavanaugh/final_project/.idea/misc.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/final_project/.idea/modules.xml b/students/KevinCavanaugh/final_project/.idea/modules.xml
new file mode 100644
index 0000000..12b00a0
--- /dev/null
+++ b/students/KevinCavanaugh/final_project/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/final_project/.idea/vcs.xml b/students/KevinCavanaugh/final_project/.idea/vcs.xml
new file mode 100644
index 0000000..c2365ab
--- /dev/null
+++ b/students/KevinCavanaugh/final_project/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/final_project/.idea/workspace.xml b/students/KevinCavanaugh/final_project/.idea/workspace.xml
new file mode 100644
index 0000000..98ef97b
--- /dev/null
+++ b/students/KevinCavanaugh/final_project/.idea/workspace.xml
@@ -0,0 +1,333 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ InventoryID
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1552172101174
+
+
+ 1552172101174
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/final_project/DataModel_KevinCavanaugh.py b/students/KevinCavanaugh/final_project/DataModel_KevinCavanaugh.py
new file mode 100644
index 0000000..a0d82b0
--- /dev/null
+++ b/students/KevinCavanaugh/final_project/DataModel_KevinCavanaugh.py
@@ -0,0 +1,135 @@
+from datetime import datetime
+
+
+class Product(object):
+
+ def __init__(self, product_id: int, product_name: str):
+ self.product_id = product_id
+ self.product_name = product_name
+
+ def __str__(self):
+ return f'{self.product_id},{self.product_name}'
+
+ def __repr__(self):
+ return f'{Product},[{str(self.__dict__())}'
+
+ def __dict__(self):
+ return {"product_id": self.product_id, "product_name": self.product_name}
+
+ @property
+ def product_id(self):
+ return self.__product_id
+
+ @product_id.setter
+ def product_id(self, product_id):
+ if type(product_id) is not int:
+ raise TypeError("Requires integer!")
+ if product_id <= 0:
+ raise ValueError("Requires value greater than zero!")
+ else:
+ self.__product_id = product_id
+
+ @property
+ def product_name(self):
+ return self.__product_name
+
+ @product_name.setter
+ def product_name(self, product_name):
+ self.__product_name = str(product_name).strip()
+
+ # Add properties and validation
+ # product_id > 0
+
+
+class InventoryCount(object):
+
+ def __init__(self, product: Product, count: int):
+ self.product = product
+ self.count = count
+
+ @property
+ def count(self):
+ return self.__count
+
+ @count.setter
+ def count(self, count):
+ if type(count) is not int: raise TypeError("Requires integer!")
+ if count <= 0:
+ raise ValueError("Requires value greater than zero!")
+ else:
+ self.__count = count
+
+ @property
+ def product(self):
+ return self.__product
+
+ @product.setter
+ def product(self, product):
+ if type(product) is not Product:
+ raise TypeError("Requires product object!")
+ else:
+ self.__product = product
+
+ # Add properties and validation
+ # count >= 0
+ # product is Product
+
+
+class Inventory(object):
+ def __init__(self, inventory_id: int, inventory_date: datetime.date, inventory_counts: InventoryCount = [None]):
+ self.inventory_id = inventory_id
+ self.inventory_date = inventory_date
+ if inventory_counts is not None:
+ self.inventory_counts = inventory_counts
+
+ @property
+ def inventory_id(self):
+ return self.__inventory_id
+
+ @inventory_id.setter
+ def inventory_id(self, inventory_id):
+ if inventory_id <= 0:
+ raise ValueError("Requires value greater than zero!")
+ else:
+ self.__inventory_id = inventory_id
+
+ @property
+ def inventory_date(self):
+ return self.__inventory_date
+
+ @inventory_date.setter
+ def inventory_date(self, inventory_date):
+ # if type(inventory_date) is not datetime:
+ # raise TypeError("Requires datetime object!")
+ # else:
+ self.__inventory_date = inventory_date
+
+ @property
+ def inventory_counts(self):
+ return self.__inventory_counts
+
+ @inventory_counts.setter
+ def inventory_counts(self, inventory_counts):
+ # if type(inventory_counts) is not InventoryCount:
+ # raise TypeError("Requires InventoryCount Object")
+ # else:
+ self.__inventory_counts = inventory_counts
+
+
+ # Add properties and validation
+ # inventory_id > 0
+ # date is datetime
+ # inventory_count is inventory_count
+
+
+if __name__ == '__main__':
+ p1 = Product(100, "ProdA")
+ p2 = Product(200, "ProdB")
+ ic1 = InventoryCount(p1, 15)
+ ic2 = InventoryCount(p2, 45)
+ invJan0119 = Inventory(1, '2020-01-01', [ic1,ic2])
+ for ic in invJan0119.inventory_counts:
+ print('Jan 2019 -', ic.product.product_name, ' = ', ic.count)
+ print(p1, str(p1), p1.__str__())
+ print(repr(p1))
+ print(p1.__dict__())
\ No newline at end of file
diff --git a/students/KevinCavanaugh/final_project/DataProcessor_KevinCavanaugh.py b/students/KevinCavanaugh/final_project/DataProcessor_KevinCavanaugh.py
new file mode 100644
index 0000000..9c07ae1
--- /dev/null
+++ b/students/KevinCavanaugh/final_project/DataProcessor_KevinCavanaugh.py
@@ -0,0 +1,264 @@
+import sqlite3
+from sqlite3 import Error as sqlErr
+import re as rex
+
+debugDP = True
+
+class DBProcessor(object):
+
+ def __init__(self, db_name: str = ":memory:"): # Handy for testing!
+ self.__db_name = db_name
+ self.__db_con = self.create_connection(self.db_name)
+
+ @property
+ def db_name(self): # Get DB Name
+ return self.__db_name
+
+ @property
+ def db_con(self): # Get Live Connection
+ return self.__db_con
+
+ # SQL Validators
+ @staticmethod
+ def check_for_extra_semicolon(sql_str):
+ """Checks for an extra semicolon"""
+ # print(len("Select;Delete From T1; ID, Name FROM T1;".split(';')) > 2)
+ try:
+ if len(sql_str.split(';')) > 2:
+ raise sqlErr("Extra Semi-Colon Detected!")
+ except Exception as e:
+ raise e
+
+ @staticmethod
+ def check_for_or(sql_str):
+ """Checks for an injected OR in tampered WHERE Clause"""
+ # print(rex.search("WHERE", "SELECT * FROM T1 WHERE", rex.IGNORECASE))
+ # print(rex.search("or","FROM T1 WHERE ID = 1 or 1 = 1".split('WHERE')[1], rex.IGNORECASE))
+ try:
+ if rex.search("WHERE", sql_str, rex.IGNORECASE): # If it has a Where clause
+ if rex.search(' or ', sql_str.split('WHERE')[1], rex.IGNORECASE) is not None: # injected OR?
+ raise sqlErr("OR Detected!")
+ except Exception as e:
+ raise e
+
+ @staticmethod
+ def check_for_date(date_str):
+ """Checks for an valid date string"""
+ try:
+ if rex.match("\d\d\d\d-\d\d-\d\d", str(date_str)) is None:
+ raise sqlErr("Not a Date!")
+ except Exception as e:
+ raise e
+
+ def create_connection(self, db_file: str):
+ """ Create or connect to a SQLite database """
+ try:
+ con = sqlite3.connect(db_file)
+ except sqlErr as se:
+ raise Exception('SQL Error in create_connection(): ' + se.__str__())
+ except Exception as e:
+ raise Exception('General Error in create_connection(): ' + e.__str__())
+ return con
+
+ def execute_sql_code(self, sql_code: str = ''):
+ """ Execute SQL code on a open connection """
+ db_con = self.db_con
+ try:
+ if db_con is not None and sql_code != '':
+ # Validate
+ self.check_for_extra_semicolon(sql_code);
+ self.check_for_or(sql_code);
+ # Connect and Run
+ with db_con:
+ csr = db_con.cursor()
+ csr.execute(sql_code)
+ else:
+ raise Exception('SQL Code or Connection is missing!')
+ except sqlErr as se:
+ raise Exception('SQL Error in execute_sql_code(): ' + se.__str__())
+ except Exception as e:
+ raise Exception('General Error in execute_sql_code(): ' + e.__str__())
+ return csr
+
+ def build_ins_code(self): # create (C/R/U/D)
+ # Validate Input
+ sql = str.format("INSERT Not Implemented Yet")
+ return sql
+
+ def build_sel_code(self): # read
+ # Validate Input
+ sql = str.format("SELECT Not Implemented Yet")
+ return sql
+
+ def build_upd_code(self): # update
+ # Validate Input
+ sql = str.format("UPDATE Not Implemented Yet")
+ return sql
+
+ def build_del_code(self): # delete
+ # Validate Input
+ # Validate Input
+ sql = str.format("DELETE Not Implemented Yet")
+ return sql
+
+
+class InventoryProcessor(DBProcessor):
+
+ def build_ins_code(self, inventory_id: int, inventory_date: str):
+ DBProcessor.check_for_date(inventory_date)
+ sql = str.format("INSERT INTO Inventories (InventoryID, InventoryDate) "
+ "VALUES ({id},'{date}');", id=inventory_id, date=inventory_date)
+ return sql
+
+ def build_upd_code(self, inventory_id: int, inventory_date: str ):
+ DBProcessor.check_for_date(inventory_date)
+ sql = str.format("UPDATE Inventories SET InventoryDate = '{date}' "
+ "WHERE InventoryID = {id};", id=inventory_id, date=inventory_date)
+ return sql
+
+ def build_del_code(self, inventory_id: int):
+ sql = str.format("DELETE FROM Inventories "
+ "WHERE InventoryID = {id};", id=inventory_id)
+ return sql
+
+ def build_sel_code(self, inventory_id: int = None):
+ if inventory_id is not None:
+ w = ' WHERE InventoryID = ' + str(inventory_id)
+ else:
+ w = ''
+ sql = str.format("SELECT InventoryID, InventoryDate "
+ "FROM Inventories{WHERE};", WHERE=w)
+ return sql
+
+
+class ProductProcessor (DBProcessor):
+
+ def build_ins_code(self, product_id: int, product_name: str):
+ sql = str.format("INSERT INTO Products (ProductID, ProductName) "
+ "VALUES ({id},'{name}');", id=product_id, name=product_name)
+ return sql
+
+ def build_upd_code(self, product_id: int, product_name: str ):
+ sql = str.format("UPDATE Products SET ProductName = '{name}' "
+ "WHERE InventoryID = {id};", id=product_id, name=product_name)
+ return sql
+
+ def build_del_code(self, product_id: int):
+ sql = str.format("DELETE FROM Products "
+ "WHERE ProductID = {id};", id=product_id)
+ return sql
+
+ def build_sel_code(self, product_id: int = None):
+ if product_id is not None:
+ w = ' WHERE ProductID = ' + str(product_id)
+ else:
+ w = ''
+ sql = str.format("SELECT ProductID, ProductName "
+ "FROM Products{WHERE};", WHERE=w)
+ return sql
+
+
+class InventoryCountsProcessor (DBProcessor):
+
+ def build_ins_code(self, inv_count_id: int, product_id: int, count: int):
+ sql = str.format("INSERT INTO InventoryCounts (InventoryCountID, ProductID, Count) "
+ "VALUES ({id},{pid},{count});", id=inv_count_id, pid=product_id, count=count)
+ return sql
+
+ def build_upd_code(self, inv_count_id: int, count: int):
+ sql = str.format("UPDATE InventoryCounts SET Count = {count} "
+ "WHERE InventoryCountID = {id};", id=inv_count_id, count=count)
+ return sql
+
+ def build_del_code(self, inv_count_id: int):
+ sql = str.format("DELETE FROM InventoryCounts "
+ "WHERE InventoryCountID = {id};", id=inv_count_id)
+ return sql
+
+ def build_sel_code(self, inv_count_id: int = None):
+ if inv_count_id is not None:
+ w = ' WHERE InventoryCountID = ' + str(inv_count_id)
+ else:
+ w = ''
+ sql = str.format("SELECT InventoryCountID, ProductID, Count "
+ "FROM InventoryCounts{WHERE};", WHERE=w)
+ return sql
+
+
+if __name__ == '__main__':
+ # Test DataProcessor methods
+ if debugDP == True:
+ # try: DBProcessor.check_for_or("SELECT * FROM T1 WHERE ID = 1 or 1 = 1")
+ # except Exception as e: print(e)
+ # try: DBProcessor.check_for_extra_semicolon("SELECT * ;Delete From T1; FROM T1;")
+ # except Exception as e: print(e)
+ # try: DBProcessor.check_for_date('01/01/2000')
+ # except Exception as e: print(e)
+ #
+ # dbp = DBProcessor(':memory:')
+ # print(dbp.build_ins_code())
+ # print(dbp.build_upd_code())
+ # print(dbp.build_del_code())
+ # print(dbp.build_sel_code())
+ # print(dbp.build_sel_code())
+ # print(dbp.execute_sql_code("Select 5 + 5;"))
+ # dbp.db_con.close()
+
+# Test InventoryProcessor methods ##############################
+
+ # ip = InventoryProcessor(':memory:')
+ # print(ip.build_ins_code(inventory_id=1, inventory_date='2000-01-01'))
+ # print(ip.build_upd_code(inventory_id=1, inventory_date='2000-02-02'))
+ # print(ip.build_del_code(inventory_id=1))
+ # print(ip.build_sel_code())
+ #
+ # # Create a table for testing
+ # crs = ip.db_con.cursor()
+ # crs.execute("CREATE TABLE Inventories (InventoryID int, InventoryDate date);")
+ # ip.db_con.commit()
+ # for row in crs.execute("Select name, sql From sqlite_master Where type='table;'"):
+ # print(row)
+ # ip.db_con.commit()
+ #
+ # # Test SQL Transactions
+ # ip.execute_sql_code(ip.build_ins_code(inventory_id=1, inventory_date='2000-01-01')).close()
+ # for row in ip.execute_sql_code(ip.build_sel_code()):
+ # print(row)
+ #
+ # ip.execute_sql_code(ip.build_upd_code(inventory_id=1, inventory_date='2000-02-02')).close()
+ # for row in ip.execute_sql_code(ip.build_sel_code(inventory_id=1)):
+ # print(row)
+ #
+ # ip.execute_sql_code(ip.build_del_code(inventory_id=1)).close()
+ # for row in ip.execute_sql_code(ip.build_sel_code()):
+ # print(row)
+
+# Test InventoryCountsProcessor methods ##############################
+
+ icp = InventoryCountsProcessor(':memory:')
+ print(icp.build_ins_code(inv_count_id=14566543, product_id=1, count=22))
+ print(icp.build_upd_code(inv_count_id=14566543, count=33))
+ print(icp.build_del_code(inv_count_id=14566543))
+ print(icp.build_sel_code())
+
+ # Create a table for testing
+ crs = icp.db_con.cursor()
+ crs.execute("CREATE TABLE InventoryCounts (InventoryCountID int, ProductID int, Count int);")
+ icp.db_con.commit()
+ for row in crs.execute("Select name, sql From sqlite_master Where type='table;'"):
+ print(row)
+ icp.db_con.commit()
+
+ # Test SQL Transactions
+ icp.execute_sql_code(icp.build_ins_code(inv_count_id=14566543, product_id=1, count=22)).close()
+ for row in icp.execute_sql_code(icp.build_sel_code()):
+ print(row)
+
+ icp.execute_sql_code(icp.build_upd_code(inv_count_id=14566543, count=33)).close()
+ for row in icp.execute_sql_code(icp.build_sel_code(inv_count_id=14566543)):
+ print(row)
+
+ icp.execute_sql_code(icp.build_del_code(inv_count_id=14566543)).close()
+ for row in icp.execute_sql_code(icp.build_sel_code()):
+ print(row)
+
diff --git a/students/KevinCavanaugh/final_project/Kcavanaugh_final_project.db b/students/KevinCavanaugh/final_project/Kcavanaugh_final_project.db
new file mode 100644
index 0000000..1272684
Binary files /dev/null and b/students/KevinCavanaugh/final_project/Kcavanaugh_final_project.db differ
diff --git a/students/KevinCavanaugh/final_project/UserInterface_KevinCavanaugh.py b/students/KevinCavanaugh/final_project/UserInterface_KevinCavanaugh.py
new file mode 100644
index 0000000..cc124c6
--- /dev/null
+++ b/students/KevinCavanaugh/final_project/UserInterface_KevinCavanaugh.py
@@ -0,0 +1,31 @@
+import DataProcessor_KevinCavanaugh as dp
+from DataProcessor_KevinCavanaugh import InventoryProcessor as ip
+from DataProcessor_KevinCavanaugh import InventoryCountsProcessor as icp
+from DataProcessor_KevinCavanaugh import ProductProcessor as pp
+import DataModel_KevinCavanaugh as dm
+
+# Fill Products
+# Fill Inventory Counts
+
+debugDP = False
+
+if __name__ == '__main__':
+
+ pp = dp.ProductProcessor(':memory:')
+ # Create a table for testing
+ crs = pp.db_con.cursor()
+ crs.execute("CREATE TABLE Products (ProductID int Primary Key, ProductName varchar(100));")
+ pp.db_con.commit()
+ pp.execute_sql_code(pp.build_ins_code(product_id=100, product_name='Mouse'))
+ pp.db_con.commit()
+ pp.execute_sql_code(pp.build_ins_code(product_id=200, product_name='Keyboard'))
+ pp.db_con.commit()
+
+ print(pp.build_sel_code())
+ plst = []
+ for row in crs.execute(pp.build_sel_code()):
+ print(row)
+ plst.append(dm.Product(row[0], row[1]))
+ print(plst)
+ pp.db_con.commit()
+ pp.db_con.close()
diff --git a/students/KevinCavanaugh/session4/.idea/workspace.xml b/students/KevinCavanaugh/session4/.idea/workspace.xml
index 724eee0..500744b 100644
--- a/students/KevinCavanaugh/session4/.idea/workspace.xml
+++ b/students/KevinCavanaugh/session4/.idea/workspace.xml
@@ -10,7 +10,7 @@
-
+
@@ -19,65 +19,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -102,10 +43,10 @@
-
-
+
+
-
+
@@ -113,7 +54,6 @@
-
@@ -125,6 +65,7 @@
+
@@ -247,7 +188,8 @@
-
+
+
@@ -276,27 +218,24 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
+
-
-
+
+
@@ -307,24 +246,27 @@
-
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
diff --git a/students/KevinCavanaugh/session5/.idea/encodings.xml b/students/KevinCavanaugh/session5/.idea/encodings.xml
new file mode 100644
index 0000000..15a15b2
--- /dev/null
+++ b/students/KevinCavanaugh/session5/.idea/encodings.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session5/.idea/misc.xml b/students/KevinCavanaugh/session5/.idea/misc.xml
new file mode 100644
index 0000000..4f2e687
--- /dev/null
+++ b/students/KevinCavanaugh/session5/.idea/misc.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session5/.idea/modules.xml b/students/KevinCavanaugh/session5/.idea/modules.xml
new file mode 100644
index 0000000..27da7d6
--- /dev/null
+++ b/students/KevinCavanaugh/session5/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session5/.idea/session5.iml b/students/KevinCavanaugh/session5/.idea/session5.iml
new file mode 100644
index 0000000..85c7612
--- /dev/null
+++ b/students/KevinCavanaugh/session5/.idea/session5.iml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session5/.idea/vcs.xml b/students/KevinCavanaugh/session5/.idea/vcs.xml
new file mode 100644
index 0000000..c2365ab
--- /dev/null
+++ b/students/KevinCavanaugh/session5/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session5/.idea/workspace.xml b/students/KevinCavanaugh/session5/.idea/workspace.xml
new file mode 100644
index 0000000..ce333da
--- /dev/null
+++ b/students/KevinCavanaugh/session5/.idea/workspace.xml
@@ -0,0 +1,369 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1549505284543
+
+
+ 1549505284543
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session5/TestData.txt b/students/KevinCavanaugh/session5/TestData.txt
new file mode 100644
index 0000000..f58fcd9
--- /dev/null
+++ b/students/KevinCavanaugh/session5/TestData.txt
@@ -0,0 +1,10 @@
+1,1
+1,2
+1,3
+1,4
+0,1
+0,2
+0,3
+0,4
+2,1
+2,2
diff --git a/students/KevinCavanaugh/session5/cigar_party.py b/students/KevinCavanaugh/session5/cigar_party.py
new file mode 100644
index 0000000..3b0230a
--- /dev/null
+++ b/students/KevinCavanaugh/session5/cigar_party.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+
+"""
+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):
+ return cigars >= 40 and is_weekend
+
diff --git a/students/KevinCavanaugh/session5/class_notes.py b/students/KevinCavanaugh/session5/class_notes.py
new file mode 100644
index 0000000..e69de29
diff --git a/students/KevinCavanaugh/session5/compreshion_lab.py b/students/KevinCavanaugh/session5/compreshion_lab.py
new file mode 100644
index 0000000..f6156ef
--- /dev/null
+++ b/students/KevinCavanaugh/session5/compreshion_lab.py
@@ -0,0 +1,44 @@
+feast = ['spam', 'sloths', 'orangutans', 'breakfast cereals', 'fruit bats']
+
+comp = [delicacy for delicacy in feast if len(delicacy) > 6]
+
+print(len(feast))
+
+print(len(comp))
+
+list_of_tuples = [(1, 'lumberjack'), (2, 'inquisition'), (4, 'spam')]
+
+comprehension = [ number * skit for number, skit in list_of_tuples ]
+
+print(comprehension)
+
+print(comprehension[0])
+
+print(len(comprehension[2]))
+
+dict_of_weapons = {'first': 'fear',
+ 'second': 'surprise',
+ 'third':'ruthless efficiency',
+ 'forth':'fanatical devotion',
+ 'fifth': None}
+
+dict_comprehension = {k.upper(): weapon for k, weapon in dict_of_weapons.items() if weapon}
+
+print('first' in dict_comprehension)
+
+print('FIRST' in dict_comprehension)
+
+print(len(dict_of_weapons))
+print(len(dict_comprehension))
+
+
+def count_evens(nums):
+ even_nums = [num for num in nums if num % 2 == 0]
+ return len(even_nums)
+
+
+print(count_evens([2, 1, 2, 3, 4]))
+print(count_evens([1, 3, 5]))
+
+
+
diff --git a/students/KevinCavanaugh/session5/except_exercise.py b/students/KevinCavanaugh/session5/except_exercise.py
new file mode 100644
index 0000000..26f4d9e
--- /dev/null
+++ b/students/KevinCavanaugh/session5/except_exercise.py
@@ -0,0 +1,55 @@
+#!/usr/bin/python
+
+"""
+An exercise in playing with Exceptions.
+Make lots of try/except blocks for fun and profit.
+
+Make sure to catch specifically the error you find, rather than all errors.
+"""
+
+from except_test import fun, more_fun, last_fun
+
+
+# Figure out what the exception is, catch it and while still
+# in that catch block, try again with the second item in the list
+first_try = ['spam', 'cheese', 'mr death']
+try:
+ joke = fun(first_try[0])
+except NameError:
+ print('Name cannot be found.')
+ joke = fun(first_try[1])
+
+# Here is a try/except block. Add an else that prints not_joke
+try:
+ not_joke = fun(first_try[2])
+except SyntaxError:
+ print('Run Away!')
+else:
+ print(not_joke)
+
+# What did that do? You can think of else in this context, as well as in
+# loops as meaning: "else if nothing went wrong"
+# (no breaks in loops, no exceptions in try blocks)
+
+# Figure out what the exception is, catch it and in that same block
+#
+# try calling the more_fun function with the 2nd language in the list,
+# again assigning it to more_joke.
+#
+# If there are no exceptions, call the more_fun function with the last
+# language in the list
+
+# Finally, while still in the try/except block and regardless of whether
+# there were any exceptions, call the function last_fun with no
+# parameters. (pun intended)
+
+langs = ['java', 'c', 'python']
+
+try:
+ more_joke = more_fun(langs[0])
+except IndexError:
+ print('Index out of range.')
+ more_joke = more_fun(langs[1])
+ more_joke = more_fun(langs[2])
+ last_fun()
+
diff --git a/students/KevinCavanaugh/session5/except_test.py b/students/KevinCavanaugh/session5/except_test.py
new file mode 100644
index 0000000..905dd67
--- /dev/null
+++ b/students/KevinCavanaugh/session5/except_test.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env python3
+
+"""
+silly little test module that is designed to trigger Exceptions when
+run from the except_exercise.py file
+"""
+
+import time
+
+conclude = "And what leads you to that conclusion?"
+district = "Finest in the district, sir."
+cheese = "It's certainly uncontaminated by cheese."
+clean = "Well, it's so clean."
+shop = "Not much of a cheese shop really, is it?"
+cust = "Customer: "
+clerk = "Shopkeeper: "
+
+
+def fun(reaper):
+ if reaper == 'spam':
+ print(s)
+ elif reaper == 'cheese':
+ print()
+ print('Spam, Spam, Spam, Spam, Beautiful Spam')
+ elif reaper == 'mr death':
+ print()
+ return('{}{}\n{}{}'.format(cust, shop, clerk, district))
+
+
+def more_fun(language):
+ if language == 'java':
+ test = [1, 2, 3]
+ test[5] = language
+ elif language == 'c':
+ print('{}{}\n{}{}'.format(cust, conclude, clerk, clean))
+
+
+def last_fun():
+ print(cust, cheese)
+ time.sleep(1)
+ import antigravity
diff --git a/students/KevinCavanaugh/session5/lab 5-1.py b/students/KevinCavanaugh/session5/lab 5-1.py
new file mode 100644
index 0000000..8577212
--- /dev/null
+++ b/students/KevinCavanaugh/session5/lab 5-1.py
@@ -0,0 +1,33 @@
+def sum_numbers(*args):
+ sum = 0
+ for value in args:
+ sum += value
+ return sum
+
+
+def difference_numbers(*args):
+ difference = 0
+ for value in args:
+ difference -= value
+ return difference
+
+
+def product_numbers(*args):
+ product = 1
+ for value in args:
+ product *= value
+ return product
+
+
+def quotient_numbers(*args):
+ quotient = 1
+ for value in args:
+ quotient /= value
+ return quotient
+
+
+print(sum_numbers(1,2,3,4,5))
+print(difference_numbers(1,2,3,4,5))
+print(product_numbers(1,2,3))
+print(quotient_numbers(1,2,3,4,5))
+
diff --git a/students/KevinCavanaugh/session5/mailroom_3.py b/students/KevinCavanaugh/session5/mailroom_3.py
new file mode 100644
index 0000000..45c2e80
--- /dev/null
+++ b/students/KevinCavanaugh/session5/mailroom_3.py
@@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+
+# ----------------------------------------------------------------------- #
+# Title: Mailroom_Part_3
+# Author: Kevin Cavanaugh
+# Change Log: (Who,What,When)
+# kcavanau, created document & completed assignment, 02/10/2019
+# kcavanau, playing with compression and error handling, 02/10/2019
+# ----------------------------------------------------------------------- #
+
+import sys, io, os
+
+
+# -------------------- DATA -------------------- #
+
+donors = {}
+donors['Kevin Cavanaugh'] = (500.55, 899.34, 78.94)
+donors['Victor Murphy'] = (99.89, 87.02)
+donors['Randy Brown'] = (10.11, 1000.01, 99.99)
+donors['Piper Long'] = (190.99, 100.02)
+donors['Kim Pinkie'] = (2344.44, 8999.66, 345.55)
+
+prompt = "\n".join(("What would you like to do?",
+ "1. Send a Thank You to single donor",
+ "2. Create a Report",
+ "3. Send letters to all donors",
+ "4. Quit"))
+
+
+def send_thank_you(name, donation):
+ '''
+
+ :param name:
+ :param donation:
+ :return:
+ '''
+ letter = '\n Dear {}, \n\n Thank you for the generous donation of ${:.2f}. \n We are very grateful for your' \
+ ' donation. \n\n Sincerely, \n The Team'.format(name, donation)
+ return letter + '\n'
+
+
+def add_donation(record, person, donation):
+ if person in record:
+ record[person] += donation,
+ else:
+ record[person] = donation,
+
+
+def donor_stats(donor):
+ total = sum(donors[donor])
+ num_donations = int(len(donors[donor]))
+ avg_donation = int(total / num_donations)
+ return '{:<20} ${:<15.2f} {:<10} ${:<15.2f} '.format(donor, total, num_donations, avg_donation)
+
+
+def create_report():
+ print('{:<20} |{:,<15} |{:<10} |{:,<15} '.format('Donor', 'Total', 'Num Gifts', 'Average Gift'))
+ print('-' * 60)
+ for donor in donors:
+ print(donor_stats(donor))
+ print('\n')
+
+
+def write_letters():
+ cwd = os.getcwd()
+ try:
+ os.mkdir('thank_you_letters')
+ os.chdir('thank_you_letters')
+ except FileExistsError:
+ print('Files already exists. Create new directory.')
+ new_dir = input('New Directory Name: ')
+ os.mkdir(new_dir)
+ os.chdir(new_dir)
+
+ for donor in donors.keys():
+ file_name = ('thank_you_{:s}.txt'.format(donor))
+ open(file_name, 'a').close()
+ file = io.open(file_name, 'w')
+ file.write(send_thank_you(donor, donors[donor][len(donors[donor]) - 1]))
+ file.close()
+
+ os.chdir(cwd)
+
+
+def thank_single_donor():
+ name = input('Enter name of donor: ').lower()
+ while True:
+ if name == 'list':
+ for donor in donors.keys():
+ print(donor)
+ else:
+ try:
+ donation = float(input('How much did {:s} donate?'.format(name)))
+ add_donation(donors, name, donation)
+ print(send_thank_you(name, donors[name][len(donors[name]) - 1]))
+ break
+ except ValueError:
+ print('You must enter a number.')
+
+
+def quit_mailroom():
+ input('Press enter to exit! :) Have nice day')
+ return sys.exit()
+
+
+def user_input(choice):
+ options = {'1': thank_single_donor,
+ '2': create_report,
+ '3': write_letters,
+ '4': quit_mailroom}
+ return options.get(choice)()
+
+
+def main():
+ while True:
+ try:
+ response = input(prompt)
+ user_input(response)
+ except TypeError:
+ print('\n Select a valid option! \n')
+ input('Press enter to continue...')
+
+
+if __name__ == "__main__":
+ main()
diff --git a/students/KevinCavanaugh/session5/new/thank_you_Kevin Cavanaugh.txt b/students/KevinCavanaugh/session5/new/thank_you_Kevin Cavanaugh.txt
new file mode 100644
index 0000000..663edbd
--- /dev/null
+++ b/students/KevinCavanaugh/session5/new/thank_you_Kevin Cavanaugh.txt
@@ -0,0 +1,8 @@
+
+ Dear Kevin Cavanaugh,
+
+ Thank you for the generous donation of $78.94.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session5/new/thank_you_Kim Pinkie.txt b/students/KevinCavanaugh/session5/new/thank_you_Kim Pinkie.txt
new file mode 100644
index 0000000..f8ca8ff
--- /dev/null
+++ b/students/KevinCavanaugh/session5/new/thank_you_Kim Pinkie.txt
@@ -0,0 +1,8 @@
+
+ Dear Kim Pinkie,
+
+ Thank you for the generous donation of $345.55.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session5/new/thank_you_Piper Long.txt b/students/KevinCavanaugh/session5/new/thank_you_Piper Long.txt
new file mode 100644
index 0000000..466f27e
--- /dev/null
+++ b/students/KevinCavanaugh/session5/new/thank_you_Piper Long.txt
@@ -0,0 +1,8 @@
+
+ Dear Piper Long,
+
+ Thank you for the generous donation of $100.02.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session5/new/thank_you_Randy Brown.txt b/students/KevinCavanaugh/session5/new/thank_you_Randy Brown.txt
new file mode 100644
index 0000000..9345d3e
--- /dev/null
+++ b/students/KevinCavanaugh/session5/new/thank_you_Randy Brown.txt
@@ -0,0 +1,8 @@
+
+ Dear Randy Brown,
+
+ Thank you for the generous donation of $99.99.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session5/new/thank_you_Victor Murphy.txt b/students/KevinCavanaugh/session5/new/thank_you_Victor Murphy.txt
new file mode 100644
index 0000000..e5d9683
--- /dev/null
+++ b/students/KevinCavanaugh/session5/new/thank_you_Victor Murphy.txt
@@ -0,0 +1,8 @@
+
+ Dear Victor Murphy,
+
+ Thank you for the generous donation of $87.02.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session5/new/thank_you_dan.txt b/students/KevinCavanaugh/session5/new/thank_you_dan.txt
new file mode 100644
index 0000000..75192f2
--- /dev/null
+++ b/students/KevinCavanaugh/session5/new/thank_you_dan.txt
@@ -0,0 +1,8 @@
+
+ Dear dan,
+
+ Thank you for the generous donation of $2.00.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session5/test_cigar_party.py b/students/KevinCavanaugh/session5/test_cigar_party.py
new file mode 100644
index 0000000..3af7023
--- /dev/null
+++ b/students/KevinCavanaugh/session5/test_cigar_party.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+
+"""
+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(30, False) is False
+
+
+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
diff --git a/students/KevinCavanaugh/session5/thank_you_letters/thank_you_Kevin Cavanaugh.txt b/students/KevinCavanaugh/session5/thank_you_letters/thank_you_Kevin Cavanaugh.txt
new file mode 100644
index 0000000..663edbd
--- /dev/null
+++ b/students/KevinCavanaugh/session5/thank_you_letters/thank_you_Kevin Cavanaugh.txt
@@ -0,0 +1,8 @@
+
+ Dear Kevin Cavanaugh,
+
+ Thank you for the generous donation of $78.94.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session5/thank_you_letters/thank_you_Kim Pinkie.txt b/students/KevinCavanaugh/session5/thank_you_letters/thank_you_Kim Pinkie.txt
new file mode 100644
index 0000000..f8ca8ff
--- /dev/null
+++ b/students/KevinCavanaugh/session5/thank_you_letters/thank_you_Kim Pinkie.txt
@@ -0,0 +1,8 @@
+
+ Dear Kim Pinkie,
+
+ Thank you for the generous donation of $345.55.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session5/thank_you_letters/thank_you_Piper Long.txt b/students/KevinCavanaugh/session5/thank_you_letters/thank_you_Piper Long.txt
new file mode 100644
index 0000000..466f27e
--- /dev/null
+++ b/students/KevinCavanaugh/session5/thank_you_letters/thank_you_Piper Long.txt
@@ -0,0 +1,8 @@
+
+ Dear Piper Long,
+
+ Thank you for the generous donation of $100.02.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session5/thank_you_letters/thank_you_Randy Brown.txt b/students/KevinCavanaugh/session5/thank_you_letters/thank_you_Randy Brown.txt
new file mode 100644
index 0000000..9345d3e
--- /dev/null
+++ b/students/KevinCavanaugh/session5/thank_you_letters/thank_you_Randy Brown.txt
@@ -0,0 +1,8 @@
+
+ Dear Randy Brown,
+
+ Thank you for the generous donation of $99.99.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session5/thank_you_letters/thank_you_Victor Murphy.txt b/students/KevinCavanaugh/session5/thank_you_letters/thank_you_Victor Murphy.txt
new file mode 100644
index 0000000..e5d9683
--- /dev/null
+++ b/students/KevinCavanaugh/session5/thank_you_letters/thank_you_Victor Murphy.txt
@@ -0,0 +1,8 @@
+
+ Dear Victor Murphy,
+
+ Thank you for the generous donation of $87.02.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session6/mailroom_4.py b/students/KevinCavanaugh/session6/mailroom_4.py
new file mode 100644
index 0000000..5a3bd1e
--- /dev/null
+++ b/students/KevinCavanaugh/session6/mailroom_4.py
@@ -0,0 +1,136 @@
+#!/usr/bin/env python3
+
+# ----------------------------------------------------------------------- #
+# Title: Mailroom_Part_3
+# Author: Kevin Cavanaugh
+# Change Log: (Who,What,When)
+# kcavanau, created document & completed assignment, 02/10/2019
+# kcavanau, playing with compression and error handling, 02/10/2019
+# ----------------------------------------------------------------------- #
+
+import sys, io, os
+
+
+# -------------------- DATA -------------------- #
+
+donors = {}
+donors['Kevin Cavanaugh'] = (500.55, 899.34, 78.94)
+donors['Victor Murphy'] = (99.89, 87.02)
+donors['Randy Brown'] = (10.11, 1000.01, 99.99)
+donors['Piper Long'] = (190.99, 100.02)
+donors['Kim Pinkie'] = (2344.44, 8999.66, 345.55)
+
+prompt = "\n".join(("What would you like to do?",
+ "1. Send a Thank You to single donor",
+ "2. Create a Report",
+ "3. Send letters to all donors",
+ "4. Quit"))
+
+
+def send_thank_you(name, donation):
+ '''
+
+ :param name:
+ :param donation:
+ :return:
+ '''
+ letter = '\n Dear {}, \n\n Thank you for the generous donation of ${:.2f}. \n We are very grateful for your' \
+ ' donation. \n\n Sincerely, \n The Team'.format(name, donation)
+ return letter + '\n'
+
+
+def add_donation(record, person, donation):
+ if person in record:
+ record[person] += donation,
+ else:
+ record[person] = donation,
+ return record
+
+
+def donor_stats(donor):
+ total = sum(donors[donor])
+ num_donations = int(len(donors[donor]))
+ avg_donation = int(total / num_donations)
+ return '{:<20} ${:<15.2f} {:<10} ${:<15.2f} '.format(donor, total, num_donations, avg_donation)
+
+
+def create_report(database):
+ report = ('{:<20} |{:<15} |{:<10} |{:<15}\n '.format('Donor', 'Total', 'Num Gifts', 'Average Gift'))
+ report += '-' * 60 + '\n'
+ for donor in database:
+ report += donor_stats(donor) + '\n'
+ return report
+
+
+def display_report():
+ print(create_report(donors))
+
+def write_letters():
+ cwd = os.getcwd()
+ try:
+ os.mkdir('thank_you_letters')
+ os.chdir('thank_you_letters')
+ except FileExistsError:
+ print('Files already exists. Create new directory.')
+ new_dir = input('New Directory Name: ')
+ os.mkdir(new_dir)
+ os.chdir(new_dir)
+
+ for donor in donors.keys():
+ file_name = ('thank_you_{:s}.txt'.format(donor))
+ open(file_name, 'a').close()
+ file = io.open(file_name, 'w')
+ file.write(send_thank_you(donor, donors[donor][len(donors[donor]) - 1]))
+ file.close()
+
+ os.chdir(cwd)
+
+
+def thank_single_donor():
+ name = input('Enter name of donor: ').lower()
+ while True:
+ if name == 'list':
+ print(create_donor_list())
+ break
+ else:
+ try:
+ donation = float(input('How much did {:s} donate?'.format(name)))
+ add_donation(donors, name, donation)
+ print(send_thank_you(name, donors[name][len(donors[name]) - 1]))
+ break
+ except ValueError:
+ print('You must enter a number.')
+
+
+def create_donor_list():
+ donor_list = 'Donors: \n'
+ for donor in donors:
+ donor_list += donor + '\n'
+ return donor_list
+
+
+def quit_mailroom():
+ input('Press enter to exit! :) Have nice day')
+ return sys.exit()
+
+
+def user_input(choice):
+ options = {'1': thank_single_donor,
+ '2': display_report,
+ '3': write_letters,
+ '4': quit_mailroom}
+ return options.get(choice)()
+
+
+def main():
+ while True:
+ try:
+ response = input(prompt)
+ user_input(response)
+ except TypeError:
+ print('\n Select a valid option! \n')
+ input('Press enter to continue...')
+
+
+if __name__ == "__main__":
+ main()
diff --git a/students/KevinCavanaugh/session6/notes.py b/students/KevinCavanaugh/session6/notes.py
new file mode 100644
index 0000000..cc26c41
--- /dev/null
+++ b/students/KevinCavanaugh/session6/notes.py
@@ -0,0 +1,21 @@
+class Person:
+
+ # --Constructor--
+ def __init__(self, FirstName, Email=None): # Overloaded
+ # Instance Attributes
+ self.FirstName = FirstName
+ self.Email = Email
+
+ # --Methods--
+
+ def ToString(self):
+ return self.FirstName + ', ' + str(self.Email)
+
+
+# --End of class--
+
+objP1 = Person("Bob", "BSmith@GoMail.com")
+objP2 = Person("Sue")
+print(objP1.ToString())
+print("-------------")
+print(objP2.ToString())
diff --git a/students/KevinCavanaugh/session6/test_mailroom4.py b/students/KevinCavanaugh/session6/test_mailroom4.py
new file mode 100644
index 0000000..8b3ee6f
--- /dev/null
+++ b/students/KevinCavanaugh/session6/test_mailroom4.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+
+import os
+
+import mailroom_4 as mailroom
+
+donors = {}
+donors['Kevin Cavanaugh'] = (500.55, 899.34, 78.94)
+donors['Victor Murphy'] = (99.89, 87.02)
+donors['Randy Brown'] = (10.11, 1000.01, 99.99)
+donors['Piper Long'] = (190.99, 100.02)
+donors['Kim Pinkie'] = (2344.44, 8999.66, 345.55)
+
+
+def test_donor_list():
+ listing = mailroom.create_donor_list()
+ assert "Kevin Cavanaugh" in listing
+ assert len(listing.split('\n')) == 7
+ assert listing.startswith("Donors: \n")
+
+
+def test_create_report():
+ report = mailroom.create_report(donors)
+ assert report.startswith('Donor |Total |Num Gifts |Average Gift')
+
+
+def test_add_donation():
+ name = "Randal Root"
+ donation = "500"
+ mailroom.add_donation(donors, name, donation)
+ assert donors['Randal Root']
+
+
+def test_write_letter():
+ mailroom.write_letters()
+ assert os.path.isdir('thank_you_letters')
+
diff --git a/students/KevinCavanaugh/session6/thank_you_letters/thank_you_Kevin Cavanaugh.txt b/students/KevinCavanaugh/session6/thank_you_letters/thank_you_Kevin Cavanaugh.txt
new file mode 100644
index 0000000..663edbd
--- /dev/null
+++ b/students/KevinCavanaugh/session6/thank_you_letters/thank_you_Kevin Cavanaugh.txt
@@ -0,0 +1,8 @@
+
+ Dear Kevin Cavanaugh,
+
+ Thank you for the generous donation of $78.94.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session6/thank_you_letters/thank_you_Kim Pinkie.txt b/students/KevinCavanaugh/session6/thank_you_letters/thank_you_Kim Pinkie.txt
new file mode 100644
index 0000000..f8ca8ff
--- /dev/null
+++ b/students/KevinCavanaugh/session6/thank_you_letters/thank_you_Kim Pinkie.txt
@@ -0,0 +1,8 @@
+
+ Dear Kim Pinkie,
+
+ Thank you for the generous donation of $345.55.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session6/thank_you_letters/thank_you_Piper Long.txt b/students/KevinCavanaugh/session6/thank_you_letters/thank_you_Piper Long.txt
new file mode 100644
index 0000000..466f27e
--- /dev/null
+++ b/students/KevinCavanaugh/session6/thank_you_letters/thank_you_Piper Long.txt
@@ -0,0 +1,8 @@
+
+ Dear Piper Long,
+
+ Thank you for the generous donation of $100.02.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session6/thank_you_letters/thank_you_Randy Brown.txt b/students/KevinCavanaugh/session6/thank_you_letters/thank_you_Randy Brown.txt
new file mode 100644
index 0000000..9345d3e
--- /dev/null
+++ b/students/KevinCavanaugh/session6/thank_you_letters/thank_you_Randy Brown.txt
@@ -0,0 +1,8 @@
+
+ Dear Randy Brown,
+
+ Thank you for the generous donation of $99.99.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session6/thank_you_letters/thank_you_Victor Murphy.txt b/students/KevinCavanaugh/session6/thank_you_letters/thank_you_Victor Murphy.txt
new file mode 100644
index 0000000..e5d9683
--- /dev/null
+++ b/students/KevinCavanaugh/session6/thank_you_letters/thank_you_Victor Murphy.txt
@@ -0,0 +1,8 @@
+
+ Dear Victor Murphy,
+
+ Thank you for the generous donation of $87.02.
+ We are very grateful for your donation.
+
+ Sincerely,
+ The Team
diff --git a/students/KevinCavanaugh/session7/.idea/encodings.xml b/students/KevinCavanaugh/session7/.idea/encodings.xml
new file mode 100644
index 0000000..15a15b2
--- /dev/null
+++ b/students/KevinCavanaugh/session7/.idea/encodings.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session7/.idea/misc.xml b/students/KevinCavanaugh/session7/.idea/misc.xml
new file mode 100644
index 0000000..7868e69
--- /dev/null
+++ b/students/KevinCavanaugh/session7/.idea/misc.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session7/.idea/modules.xml b/students/KevinCavanaugh/session7/.idea/modules.xml
new file mode 100644
index 0000000..018e292
--- /dev/null
+++ b/students/KevinCavanaugh/session7/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session7/.idea/session7.iml b/students/KevinCavanaugh/session7/.idea/session7.iml
new file mode 100644
index 0000000..85c7612
--- /dev/null
+++ b/students/KevinCavanaugh/session7/.idea/session7.iml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session7/.idea/vcs.xml b/students/KevinCavanaugh/session7/.idea/vcs.xml
new file mode 100644
index 0000000..c2365ab
--- /dev/null
+++ b/students/KevinCavanaugh/session7/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session7/.idea/workspace.xml b/students/KevinCavanaugh/session7/.idea/workspace.xml
new file mode 100644
index 0000000..f649092
--- /dev/null
+++ b/students/KevinCavanaugh/session7/.idea/workspace.xml
@@ -0,0 +1,251 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1551038102257
+
+
+ 1551038102257
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session7/html_render.py b/students/KevinCavanaugh/session7/html_render.py
new file mode 100644
index 0000000..ca7db08
--- /dev/null
+++ b/students/KevinCavanaugh/session7/html_render.py
@@ -0,0 +1,212 @@
+#!/usr/bin/env python3
+
+# ----------------------------------------------------------------------- #
+# Title: html_render
+# Author: Kevin Cavanaugh
+# Change Log: (Who,What,When)
+# kcavanau, started assignment, 02/24/2019
+# ----------------------------------------------------------------------- #
+
+"""
+A class-based system for rendering html.
+"""
+
+
+# This is the framework for the base class
+class Element(object):
+
+ tag = "html"
+ content_separator = "\n"
+ content_indent = True
+ indent = 4
+
+ def __init__(self, content=None, **kwargs):
+ self.content = []
+ self.html_attributes = kwargs
+ if content is not None:
+ self.append(content)
+
+ def append(self, new_content):
+ if hasattr(new_content, 'render'):
+ self.content.append(new_content)
+ else:
+ self.content.append(TextWrapper(str(new_content)))
+
+ def render(self, out_file, cur_ind=0):
+ indent_text = ' ' * cur_ind
+ self.tag_open(out_file, indent_text)
+ self.tag_content(out_file, cur_ind)
+ self.tag_close(out_file, indent_text)
+
+ def attributes_text(self):
+ return "".join((f' {attribute}="{value}"' for attribute, value in self.html_attributes.items()))
+
+ def tag_open(self, out_file, indent_text=''):
+ out_file.write(f"{indent_text}<{self.tag}{self.attributes_text()}>{self.content_separator}")
+
+ def tag_close(self, out_file, indent_text=''):
+ out_file.write(f"{indent_text}")
+
+ def tag_content(self, out_file, curr_ind=0):
+ for line in self.content:
+ line.render(out_file, curr_ind + self.indent)
+ out_file.write(self.content_separator)
+
+
+class TextWrapper:
+ """
+ A simple wrapper that creates a class with a render method
+ for simple text
+ """
+
+ def __init__(self, text):
+ self.text = text
+
+ def render(self, file_out, curr_ind=0):
+ file_out.write(f"{' ' * curr_ind}{self.text}")
+
+
+class Html(Element):
+ """
+ Top Level HTML element
+ """
+ tag = "html"
+
+ def render(self, out_file, cur_ind=0):
+ out_file.write(f"{' ' * cur_ind}\n")
+ Element.render(self, out_file, cur_ind)
+
+
+class Body(Element):
+ """
+ Body HTML element
+ """
+ tag = "body"
+
+
+class P(Element):
+ """
+ Paragraph
HTML element
+ """
+ tag = "p"
+
+
+class Head(Element):
+ """
+ Head HTML element tag
+ """
+ tag = "head"
+
+
+class OneLineTag(Element):
+ """
+ Base class for single line HTML tags
+ """
+ content_separator = ""
+
+ def tag_close(self, out_file, indent_text=''):
+ out_file.write(f"")
+
+ def tag_content(self, out_file, curr_ind=0):
+ for line in self.content:
+ line.render(out_file, 0)
+ out_file.write(self.content_separator)
+
+
+class Title(OneLineTag):
+ """
+ HTML Title element
+ """
+ tag = "title"
+
+
+class SelfClosingTag(Element):
+ """
+ Base class for self closing tags
+ """
+ content_separator = ""
+
+ def __init__(self, content=None, **kwargs):
+ if content is not None:
+ raise TypeError("Self closing tags cannot have content")
+ Element.__init__(self, **kwargs)
+
+ def append(self, new_content):
+ if new_content is not None:
+ raise TypeError("Self closing tags cannot have content")
+
+ def render(self, out_file, cur_ind=0):
+ """
+ Write the self closing tag with attributes
+ """
+ out_file.write(f"{' ' * cur_ind}<{self.tag}{self.attributes_text()} />")
+
+
+class Hr(SelfClosingTag):
+ """
+ HTML Title element
+ """
+ tag = "hr"
+
+
+class Br(SelfClosingTag):
+ """
+ HTML Title element
+ """
+ tag = "br"
+
+
+class A(OneLineTag):
+ """
+ HTML Anchor (A) element
+ """
+ tag = "a"
+ content_separator = ""
+ indent_content = False
+
+ def __init__(self, link, content=None, **kwargs):
+ kwargs.setdefault("href", link)
+ Element.__init__(self, content, **kwargs)
+
+
+class Ul(Element):
+ """
+ HTML Unordered List (ul) element
+ """
+ tag = "ul"
+
+
+class Li(Element):
+ """
+ HTML List Item (li) element
+ """
+ tag = "li"
+
+
+class H(OneLineTag):
+ """
+ HTML Header (h1, h2, h3, h4, and h5) elements
+ """
+ tag = "h"
+
+ def __init__(self, level, content=None, **kwargs):
+ if 1 > level > 5:
+ raise TypeError("Header must be between 1 and 5")
+ self.tag = f"h{level:d}"
+ Element.__init__(self, content, **kwargs)
+
+
+class Meta(SelfClosingTag):
+ """
+ HTML Meta element
+ """
+ tag = "meta"
+
+
+class Input(Element):
+ """
+ HTML Input element
+ """
+ tag = "input"
+
+
diff --git a/students/KevinCavanaugh/session7/run_html_render.py b/students/KevinCavanaugh/session7/run_html_render.py
new file mode 100644
index 0000000..35d17e2
--- /dev/null
+++ b/students/KevinCavanaugh/session7/run_html_render.py
@@ -0,0 +1,231 @@
+#!/usr/bin/env python3
+
+"""
+a simple script can run and test your html rendering classes.
+
+Uncomment the steps as you add to your rendering.
+
+"""
+
+from io import StringIO
+
+# importing the html_rendering code with a short name for easy typing.
+import html_render as hr
+
+
+# writing the file out:
+def render_page(page, filename, indent=None):
+ """
+ render the tree of elements
+
+ This uses StringIO to render to memory, then dump to console and
+ write to file -- very handy!
+ """
+
+ f = StringIO()
+ if indent is None:
+ page.render(f)
+ else:
+ page.render(f, indent)
+
+ print(f.getvalue())
+ with open(filename, 'w') as outfile:
+ outfile.write(f.getvalue())
+
+
+# Step 1
+#########
+
+page = hr.Element()
+
+page.append("Here is a paragraph of text -- there could be more of them, "
+ "but this is enough to show that we can do some text")
+
+page.append("And here is another piece of text -- you should be able to add any number")
+
+render_page(page, "test_html_output1.html")
+
+# The rest of the steps have been commented out.
+# Uncomment them as you move along with the assignment.
+
+## Step 2
+##########
+
+page = hr.Html()
+
+body = hr.Body()
+
+body.append(hr.P("Here is a paragraph of text -- there could be more of them, "
+ "but this is enough to show that we can do some text"))
+
+body.append(hr.P("And here is another piece of text -- you should be able to add any number"))
+
+page.append(body)
+
+render_page(page, "test_html_output2.html")
+
+# Step 3
+##########
+
+page = hr.Html()
+
+head = hr.Head()
+head.append(hr.Title("PythonClass = Revision 1087:"))
+
+page.append(head)
+
+body = hr.Body()
+
+body.append(hr.P("Here is a paragraph of text -- there could be more of them, "
+ "but this is enough to show that we can do some text"))
+body.append(hr.P("And here is another piece of text -- you should be able to add any number"))
+
+page.append(body)
+
+render_page(page, "test_html_output3.html")
+
+# Step 4
+##########
+
+page = hr.Html()
+
+head = hr.Head()
+head.append(hr.Title("PythonClass = Revision 1087:"))
+
+page.append(head)
+
+body = hr.Body()
+
+body.append(hr.P("Here is a paragraph of text -- there could be more of them, "
+ "but this is enough to show that we can do some text",
+ style="text-align: center; font-style: oblique;"))
+
+page.append(body)
+
+render_page(page, "test_html_output4.html")
+
+# Step 5
+#########
+
+page = hr.Html()
+
+head = hr.Head()
+head.append(hr.Title("PythonClass = Revision 1087:"))
+
+page.append(head)
+
+body = hr.Body()
+
+body.append(hr.P("Here is a paragraph of text -- there could be more of them, "
+ "but this is enough to show that we can do some text",
+ style="text-align: center; font-style: oblique;"))
+
+body.append(hr.Hr())
+
+page.append(body)
+
+render_page(page, "test_html_output5.html")
+
+# Step 6
+#########
+
+page = hr.Html()
+
+head = hr.Head()
+head.append(hr.Title("PythonClass = Revision 1087:"))
+
+page.append(head)
+
+body = hr.Body()
+
+body.append(hr.P("Here is a paragraph of text -- there could be more of them, "
+ "but this is enough to show that we can do some text",
+ style="text-align: center; font-style: oblique;"))
+
+body.append(hr.Hr())
+
+body.append("And this is a ")
+body.append( hr.A("http://google.com", "link") )
+body.append("to google")
+
+page.append(body)
+
+render_page(page, "test_html_output6.html")
+
+# Step 7
+#########
+
+page = hr.Html()
+
+head = hr.Head()
+head.append(hr.Title("PythonClass = Revision 1087:"))
+
+page.append(head)
+
+body = hr.Body()
+
+body.append( hr.H(2, "PythonClass - Class 6 example") )
+
+body.append(hr.P("Here is a paragraph of text -- there could be more of them, "
+ "but this is enough to show that we can do some text",
+ style="text-align: center; font-style: oblique;"))
+
+body.append(hr.Hr())
+
+list = hr.Ul(id="TheList", style="line-height:200%")
+
+list.append( hr.Li("The first item in a list") )
+list.append( hr.Li("This is the second item", style="color: red") )
+
+item = hr.Li()
+item.append("And this is a ")
+item.append( hr.A("http://google.com", "link") )
+item.append("to google")
+
+list.append(item)
+
+body.append(list)
+
+page.append(body)
+
+render_page(page, "test_html_output7.html")
+
+# Step 8 and 9
+##############
+
+page = hr.Html()
+
+
+head = hr.Head()
+head.append( hr.Meta(charset="UTF-8") )
+head.append(hr.Title("PythonClass = Revision 1087:"))
+
+page.append(head)
+
+body = hr.Body()
+
+body.append( hr.H(2, "PythonClass - Example") )
+
+body.append(hr.P("Here is a paragraph of text -- there could be more of them, "
+ "but this is enough to show that we can do some text",
+ style="text-align: center; font-style: oblique;"))
+
+body.append(hr.Hr())
+
+list = hr.Ul(id="TheList", style="line-height:200%")
+
+list.append( hr.Li("The first item in a list") )
+list.append( hr.Li("This is the second item", style="color: red") )
+
+item = hr.Li()
+item.append("And this is a ")
+item.append( hr.A("http://google.com", "link") )
+item.append("to google")
+
+list.append(item)
+
+body.append(list)
+
+page.append(body)
+
+render_page(page, "test_html_output8.html")
diff --git a/students/KevinCavanaugh/session7/test_html_output1.html b/students/KevinCavanaugh/session7/test_html_output1.html
new file mode 100644
index 0000000..343b799
--- /dev/null
+++ b/students/KevinCavanaugh/session7/test_html_output1.html
@@ -0,0 +1,4 @@
+
+ Here is a paragraph of text -- there could be more of them, but this is enough to show that we can do some text
+ And here is another piece of text -- you should be able to add any number
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session7/test_html_output2.html b/students/KevinCavanaugh/session7/test_html_output2.html
new file mode 100644
index 0000000..25d5cdc
--- /dev/null
+++ b/students/KevinCavanaugh/session7/test_html_output2.html
@@ -0,0 +1,11 @@
+
+
+
+
+ Here is a paragraph of text -- there could be more of them, but this is enough to show that we can do some text
+
+
+ And here is another piece of text -- you should be able to add any number
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session7/test_html_output3.html b/students/KevinCavanaugh/session7/test_html_output3.html
new file mode 100644
index 0000000..b5b308c
--- /dev/null
+++ b/students/KevinCavanaugh/session7/test_html_output3.html
@@ -0,0 +1,14 @@
+
+
+
+ PythonClass = Revision 1087:
+
+
+
+ Here is a paragraph of text -- there could be more of them, but this is enough to show that we can do some text
+
+
+ And here is another piece of text -- you should be able to add any number
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session7/test_html_output4.html b/students/KevinCavanaugh/session7/test_html_output4.html
new file mode 100644
index 0000000..671fee7
--- /dev/null
+++ b/students/KevinCavanaugh/session7/test_html_output4.html
@@ -0,0 +1,11 @@
+
+
+
+ PythonClass = Revision 1087:
+
+
+
+ Here is a paragraph of text -- there could be more of them, but this is enough to show that we can do some text
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session7/test_html_output5.html b/students/KevinCavanaugh/session7/test_html_output5.html
new file mode 100644
index 0000000..92d4748
--- /dev/null
+++ b/students/KevinCavanaugh/session7/test_html_output5.html
@@ -0,0 +1,12 @@
+
+
+
+ PythonClass = Revision 1087:
+
+
+
+ Here is a paragraph of text -- there could be more of them, but this is enough to show that we can do some text
+
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session7/test_html_output6.html b/students/KevinCavanaugh/session7/test_html_output6.html
new file mode 100644
index 0000000..342e88c
--- /dev/null
+++ b/students/KevinCavanaugh/session7/test_html_output6.html
@@ -0,0 +1,15 @@
+
+
+
+ PythonClass = Revision 1087:
+
+
+
+ Here is a paragraph of text -- there could be more of them, but this is enough to show that we can do some text
+
+
+ And this is a
+ link
+ to google
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session7/test_html_output7.html b/students/KevinCavanaugh/session7/test_html_output7.html
new file mode 100644
index 0000000..e4b059e
--- /dev/null
+++ b/students/KevinCavanaugh/session7/test_html_output7.html
@@ -0,0 +1,26 @@
+
+
+
+ PythonClass = Revision 1087:
+
+
+
PythonClass - Class 6 example
+
+ Here is a paragraph of text -- there could be more of them, but this is enough to show that we can do some text
+
+
+
\ No newline at end of file
diff --git a/students/KevinCavanaugh/session7/test_html_render.py b/students/KevinCavanaugh/session7/test_html_render.py
new file mode 100644
index 0000000..c8b9e07
--- /dev/null
+++ b/students/KevinCavanaugh/session7/test_html_render.py
@@ -0,0 +1,351 @@
+"""
+test code for html_render.py
+
+This is just a start -- you will need more tests!
+"""
+
+import io
+import pytest
+
+# import * is often bad form, but makes it easier to test everything in a module.
+from html_render import *
+
+
+# utility function for testing render methods
+# needs to be used in multiple tests, so we write it once here.
+def render_result(element, ind=""):
+ """
+ calls the element's render method, and returns what got rendered as a
+ string
+ """
+ # the StringIO object is a "file-like" object -- something that
+ # provides the methods of a file, but keeps everything in memory
+ # so it can be used to test code that writes to a file, without
+ # having to actually write to disk.
+ outfile = io.StringIO()
+ # this so the tests will work before we tackle indentation
+ if ind:
+ element.render(outfile, ind)
+ else:
+ element.render(outfile)
+ return outfile.getvalue()
+
+########
+# Step 1
+########
+
+
+def test_init():
+ """
+ This only tests that it can be initialized with and without
+ some content -- but it's a start
+ """
+ e = Element()
+
+ e = Element("this is some text")
+
+
+def test_append():
+ """
+ This tests that you can append text
+
+ It doesn't test if it works --
+ that will be covered by the render test later
+ """
+ e = Element("this is some text")
+ e.append("some more text")
+
+
+def test_render_element():
+ """
+ Tests whether the Element can render two pieces of text
+ So it is also testing that the append method works correctly.
+
+ It is not testing whether indentation or line feeds are correct.
+ """
+ e = Element("this is some text")
+ e.append("and this is some more text")
+
+ # This uses the render_results utility above
+ file_contents = render_result(e).strip()
+
+ # making sure the content got in there.
+ assert("this is some text") in file_contents
+ assert("and this is some more text") in file_contents
+
+ # make sure it's in the right order
+ assert file_contents.index("this is") < file_contents.index("and this")
+
+ # making sure the opening and closing tags are right.
+ assert file_contents.startswith("")
+ assert file_contents.endswith("")
+
+
+# Uncomment this one after you get the one above to pass
+# Does it pass right away?
+def test_render_element2():
+ """
+ Tests whether the Element can render two pieces of text
+ So it is also testing that the append method works correctly.
+
+ It is not testing whether indentation or line feeds are correct.
+ """
+ e = Element()
+ e.append("this is some text")
+ e.append("and this is some more text")
+
+ # This uses the render_results utility above
+ file_contents = render_result(e).strip()
+
+ # making sure the content got in there.
+ assert("this is some text") in file_contents
+ assert("and this is some more text") in file_contents
+
+ # make sure it's in the right order
+ assert file_contents.index("this is") < file_contents.index("and this")
+
+ # making sure the opening and closing tags are right.
+ assert file_contents.startswith("")
+ assert file_contents.endswith("")
+
+
+# ########
+# # Step 2
+# ########
+
+# tests for the new tags
+def test_html():
+ e = Html("this is some text")
+ e.append("and this is some more text")
+
+ file_contents = render_result(e).strip()
+
+ assert("this is some text") in file_contents
+ assert("and this is some more text") in file_contents
+ print(file_contents)
+ assert file_contents.endswith("