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

Conflicts:
	slides_sources/source/session05.rst

Author: PythonCHB

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

@@ -727,6 +727,7 @@ Catch up!
 Material to review before next week:
 ====================================
 
+<<<<<<< HEAD
 **Unit Testing:**
 
 * Dive into Python: chapter 9:
@@ -741,3 +742,13 @@ NOTE: you will find that most introductions to unit testing with Python use  the
 
 * 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/
+
+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