From 741febddc4be8951e34519a78fd68b0888f28c67 Mon Sep 17 00:00:00 2001
From: unknown <dmarcos@DMARCOS-VM.tsi.lan>
Date: Sun, 2 Nov 2014 20:05:10 -0800
Subject: [PATCH 1/2] adding my folders and files to master

---
 Students/Danielle_Marcos/session02/inclasslab.10.07.14.py     | 4 ----
 Students/Danielle_Marcos/{session01 => session03}/list_lab.py | 0
 Students/Danielle_Marcos/session03/mailroom.py                | 0
 .../Dictionary_Lab.py => session04/dictionary_lab.py}         | 0
 4 files changed, 4 deletions(-)
 delete mode 100644 Students/Danielle_Marcos/session02/inclasslab.10.07.14.py
 rename Students/Danielle_Marcos/{session01 => session03}/list_lab.py (100%)
 create mode 100644 Students/Danielle_Marcos/session03/mailroom.py
 rename Students/Danielle_Marcos/{session03/Dictionary_Lab.py => session04/dictionary_lab.py} (100%)

diff --git a/Students/Danielle_Marcos/session02/inclasslab.10.07.14.py b/Students/Danielle_Marcos/session02/inclasslab.10.07.14.py
deleted file mode 100644
index a2f76daf..00000000
--- a/Students/Danielle_Marcos/session02/inclasslab.10.07.14.py
+++ /dev/null
@@ -1,4 +0,0 @@
-x = 1
-y = 2
-
-def mydistance:
diff --git a/Students/Danielle_Marcos/session01/list_lab.py b/Students/Danielle_Marcos/session03/list_lab.py
similarity index 100%
rename from Students/Danielle_Marcos/session01/list_lab.py
rename to Students/Danielle_Marcos/session03/list_lab.py
diff --git a/Students/Danielle_Marcos/session03/mailroom.py b/Students/Danielle_Marcos/session03/mailroom.py
new file mode 100644
index 00000000..e69de29b
diff --git a/Students/Danielle_Marcos/session03/Dictionary_Lab.py b/Students/Danielle_Marcos/session04/dictionary_lab.py
similarity index 100%
rename from Students/Danielle_Marcos/session03/Dictionary_Lab.py
rename to Students/Danielle_Marcos/session04/dictionary_lab.py

From bb804f9b725bbf6251d00881e2dbca101f5f75d0 Mon Sep 17 00:00:00 2001
From: unknown <dmarcos@DMARCOS-VM.tsi.lan>
Date: Tue, 4 Nov 2014 18:11:48 -0800
Subject: [PATCH 2/2] Adding the actual Dictionary_Lab.py file I should have.

---
 .../Danielle_Marcos/session03/mailroom.py     | 39 ++++++++++++++
 .../session04/dictionary_lab.py               | 52 ++++++++++++++++++-
 2 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/Students/Danielle_Marcos/session03/mailroom.py b/Students/Danielle_Marcos/session03/mailroom.py
index e69de29b..2aa72dca 100644
--- a/Students/Danielle_Marcos/session03/mailroom.py
+++ b/Students/Danielle_Marcos/session03/mailroom.py
@@ -0,0 +1,39 @@
+def printDonorList(donors):
+	for donor in donors:
+		print donor
+
+donors = [["Anne", 50, 100, 150], 
+["Bob", 25, 50],
+["Debbie", 5, 15, 30],
+["Eric", 65, 75, 100],
+["Fran", 250]]
+
+userInput = raw_input("(1) Send a Thank You (2) Create a Report: ")
+
+if userInput == "1":
+	name = raw_input("What is the name? ")
+	while name.lower() == "list":
+		printDonorList(donors)
+		name = raw_input("What is the name? ")
+
+	found = False
+	for donor in donors:
+		if name == donor[0]:
+			found = True
+			donationUser = donor
+	print found
+
+	if found == False:
+		newDonor = [name]
+		donors.append(newDonor)
+		donationUser = donors[-1]
+
+	money = raw_input("Show me the money: ")
+	donationUser.append(money)
+
+	printDonorList(donors)
+
+
+	
+
+
diff --git a/Students/Danielle_Marcos/session04/dictionary_lab.py b/Students/Danielle_Marcos/session04/dictionary_lab.py
index 2bca5f27..21a856a3 100644
--- a/Students/Danielle_Marcos/session04/dictionary_lab.py
+++ b/Students/Danielle_Marcos/session04/dictionary_lab.py
@@ -20,4 +20,54 @@
 else:
 	print False
 
-mydict2 = {"0"}
+list1 = range(15)
+list2 = []
+
+for i in list1:
+	print i
+	print hex(i)
+	list2.append(hex(i))
+	print list2
+
+myzip = zip (list1,list2)
+print myzip
+
+mydict2 = dict(myzip)
+print mydict2
+
+mydict3 = mydict.keys()
+print mydict3
+
+
+for i in mydict.values():
+	print i
+	if 't' in i:
+		print i
+		print i.count('t')
+
+s2 = set([2,4,6,8,10,12,14,16,18,20])
+s3 = set([3,6,9,12,15,18])
+s4 = set([4,8,12,16,20])
+
+print s2
+print s3
+print s4
+
+print s3.issubset(s2) 
+print s4.issubset(s2)
+
+s5 = set(['P','y','t','h','o','n'])
+print s5
+s5.add('i')
+print s5
+
+fs = frozenset(('m','a','r','a','t','h','o','n'))
+print fs
+
+print s5.union(fs,)
+print s5.intersection(fs,)
+
+
+
+
+