Merge branch 'master' of https://github.com/UWPCE-PythonCert/IntroToPython

Author: codedragon

Syllabus.rst

@@ -291,15 +291,17 @@ Testing
 
 Advanced Argument passing
 
-Lambda
 
-Functions as Objects
 
 **No class Nov 8th for election night**
 
 Week 7: November 15
 ...................
 
+Lambda
+
+Functions as Objects
+
 Object Oriented Programming: classes, instances, and methods
 
 

slides_sources/source/session05.rst

@@ -268,6 +268,20 @@ Anyone look at my solutions?
 
 Anything in particular you'd like me to go over?
 
+
+trigrams
+--------
+
+Let's take a close look at trigrams!
+
+Some of you have already done a nice solution to this.
+
+But some of you are not sure how to start.
+
+So let's start from the beginning...
+
+(demo)
+
 Lightning Talks
 ----------------
 
@@ -702,7 +716,7 @@ Catch up!
 * Catch up from last week.
 
   - Add Exception handling to mailroom
-  - and list (and dict, and set) comprehensions...
+  - And list (and dict, and set) comprehensions...
 
 * If you've done all that -- check out the collections module:
 
@@ -713,6 +727,22 @@ Catch up!
 Material to review before next week:
 ====================================
 
+<<<<<<< HEAD
+**Unit Testing:**
+
+* Dive into Python: chapter 9:
+  http://www.diveintopython3.net/unit-testing.html
+
+NOTE: you will find that most introductions to unit testing with Python use  the builtin ``unitest`` module. However, it is a bit heavyweight, and requires some knowledge of OOP -- classes, etc. So we'll be using pytest in this class: http://doc.pytest.org/en/latest/. But the principles of testing are the same.
+
+* Ned Batchelder's into to testing presentation:
+  http://nedbatchelder.com/text/test0.html
+
+** Advanced Argument Passing
+
+* arguments and parameters:
+  http://stupidpythonideas.blogspot.com/2013/08/arguments-and-parameters.html
+=======
 Advanced Argument Passing:
 
 https://pythontips.com/2013/08/04/args-and-kwargs-in-python-explained/
@@ -721,3 +751,4 @@ Lambda:
 
 http://www.blog.pythonlibrary.org/2015/10/28/python-101-lambda-basics/
 https://pythonconquerstheuniverse.wordpress.com/2011/08/29/lambda_tutorial/
+>>>>>>> 6c9ee7938fd092bce1f3fe304ebb95b7214bcfcc

slides_sources/source/session06.rst

@@ -1108,7 +1108,13 @@ Finish up the Labs
 Material to review for next week
 --------------------------------
 
-Object Oreiented Programming:
+Lambda:
+
+http://www.blog.pythonlibrary.org/2015/10/28/python-101-lambda-basics/
+
+https://pythonconquerstheuniverse.wordpress.com/2011/08/29/lambda_tutorial/
+
+Object Oriented Programming:
 
  * Dive into Python3: 7.2 -- 7.3
    http://www.diveintopython3.net/iterators.html#defining-classes
@@ -1121,7 +1127,7 @@ Object Oreiented Programming:
 
 [note that in py3 you don't need to inherit from object]
 
-Talk by Raymond Hettinger:
+Talks by Raymond Hettinger:
 
 https://youtu.be/HTLu2DFOdTg