a good start...

PythonCHB · PythonCHB · commit 96e3352b459f · 2012-09-03T10:53:30.000-07:00
diff --git a/week-09/code/test_random_pytest.py b/week-09/code/test_random_pytest.py
@@ -14,6 +14,7 @@ def test_shuffle():
     # make sure the shuffled sequence does not lose any elements
     random.shuffle(seq)
     seq.sort()
+    print "seq:", seq
     assert seq == range(10)
 
 def test_shuffle_immutable():
diff --git a/week-09/code/timing.py b/week-09/code/timing.py
@@ -8,10 +8,10 @@ def primes_stupid(N):
     """
     a really simple way to compute the first N prime numbers
     """
-    primes = [2,]
+    primes = [2]
     i = 3
     while len(primes) < N:
-        for j in range(2, i):
+        for j in range(2, i/2): # the "/2" is an optimization -- no point in checking even numbers
             if not i % j: # it's not prime
                 break
         else:
diff --git a/week-09/code/unittest_example.py b/week-09/code/unittest_example.py
@@ -13,7 +13,7 @@ def test_shuffle(self):
         self.assertEqual(self.seq, range(10))
 
         # should raise an exception for an immutable sequence
-        self.assertRaises(TypeError, random.shuffle, (1,2,3))
+        self.assertRaises(TypeError, random.shuffle, [1,2,3])
 
     def test_choice(self):
         element = random.choice(self.seq)
diff --git a/week-09/presentation-week09.pdf b/week-09/presentation-week09.pdf
diff --git a/week-09/presentation-week09.tex b/week-09/presentation-week09.tex
@@ -641,7 +641,7 @@ \section{Unit Testing}
 {\Large \verb|__enter__()| is run before your block of code}
 
 \vfill
-{\Large \verb|__enter__()| is run after your block of code}
+{\Large \verb|__exit__()| is run after your block of code}
 
 \vfill
 {\Large Can be used to setup/clenup before and after: open/closing files, db connections, etc}
@@ -977,15 +977,15 @@ \section{Profiling}
 %-------------------------------
 \begin{frame}[fragile]{Wrap up}
 
-%\vfill
-%{\Large Hopefully you've got a bit of an idea how to do\\[0.1in]
-%        unit testing in Python}
+\vfill
+{\Large Hopefully you've got a bit of an idea how to do\\[0.1in]
+        unit testing in Python.}
 
 \vfill
-{\Large And will now start doing it}
+{\Large And will now start doing it.}
 
 \vfill
-{\Large And have an idea how to profile and time your code}
+{\Large And have an idea how to profile and time your code.}
 
 \end{frame}
 
diff --git a/week-10/code/add_book_data.py b/week-10/code/add_book_data.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+
+"""
+sample data for persistence/serializatiion examples
+"""
+
+AddressBook = [ {'first_name': "Chris",
+                 'last_name': "Barker",
+                 'address' : {'line_1':"835 NE 33rd St",
+                              'line_2' : "",
+                              'city' : "Seattle",
+                              'state': "WA",
+                              'zip': "96543"},
+                 'email' : "PythonCHB@gmail.com",
+                 'home_phone' : "206-555-1234",
+                 'office"phone' : "123-456-7890",
+                 'cell_phone' : "234-567-8901",
+                 },
+                
+                {'first_name': "Fred",
+                 'last_name': "Jones",
+                 'address' : {'line_1':"123 SE 13th St",
+                              'line_2' : "Apt. 43",
+                              'city' : "Tacoma",
+                              'state': "WA",
+                              'zip': "93465"},
+                 'email' : "FredJones@some_company.com",
+                 'home_phone' : "510-555-1234",
+                 'office"phone' : "564-466-7990",
+                 'cell_phone' : "403-561-8911",
+                 },
+                
+                {'first_name': "Nancy",
+                 'last_name': "Wilson",
+                 'address' : {'line_1':"8654 Walnut St",
+                              'line_2' : "Suite 567",
+                              'city' : "Pasadena",
+                              'state': "CA",
+                              'zip': "12345"},
+                 'email' : "Wilson.Nancy@gmail.com",
+                 'home_phone' : "423-321-9876",
+                 'office"phone' : "123-765-9877",
+                 'cell_phone' : "432-567-8466",
+                 },
+                ]
+
diff --git a/week-10/code/python_literal.py b/week-10/code/python_literal.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+
+"""
+Example of how to save data as python literals in a py file
+
+"""
+
+outfilename = "literal_data.txt"
+
+# get the data from the py file
+from add_book_data import AddressBook
+
+# save it as python literals:
+
+outfile = open(outfilename, 'w')
+
+outfile.write(str(AddressBook))
+
+outfile.close()
+
+## see if we can re-load it
+
+data = open(outfilename, 'r').read()
+
+AddressBook2 = eval(data)
+
+if AddressBook2 == AddressBook:
+    print "they are the same"
+
+## try again with the pretty print version:
+import pprint
+
+outfilename = "literal_data_pretty.txt"
+
+outfile = open(outfilename, 'w')
+
+outfile.write(pprint.pformat(AddressBook))
+
+outfile.close()
+
+## see if we can re-load it
+data = open(outfilename, 'r').read()
+
+AddressBook2 = eval(data)
+
+if AddressBook2 == AddressBook:
+    print "pretty printed version is the same as well"
+    
diff --git a/week-10/presentation-week10.pdf b/week-10/presentation-week10.pdf
diff --git a/week-10/presentation-week10.tex b/week-10/presentation-week10.tex
