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

committing an initial crack at mailroom

Author: NewtonMD

README.rst

@@ -11,4 +11,4 @@ See the Syllabus for more detail.
 
 Class lecture materials are available in a rendered version from:
 
-http://uwpce-pythoncert.github.io/IntroPython2016a
+http://uwpce-pythoncert.github.io/IntroPython2016a

slides_sources/source/exercises/list_lab.rst

@@ -31,7 +31,7 @@ to query the user for info at the command line, you use:
 Procedure
 ---------
 
-In your student dir in the IntroPython2015 repo, create a ``session02`` dir and put in a new ``list_lab.py`` file.
+In your student dir in the repo, create a directory for today's session and put in a new ``list_lab.py`` file.
 
 The file should be an executable python script. That is to say that one
 should be able to run the script directly like so:

slides_sources/source/exercises/mailroom.rst

@@ -84,8 +84,4 @@ about so far. There is no need to go any farther than that for this assignment.
 Submission
 ----------
 
-As always, put the new file in your student directory in a ``session03``
-directory, and add it to your clone early. Make frequent commits with
-good, clear messages about what you are doing and why.
-
-When you are done, push your changes and make a pull request.
+As always, put the new file in your student directory and git add it to your repo early. Make frequent commits with good, clear messages about what you are doing and why.  When you are done, push your changes and make a pull request.

slides_sources/source/include.rst

@@ -1,16 +1,25 @@
+.. include.rst
+..
+.. Include this file at the top of project source files to effect substitutions in the source.
+.. Note that preformatted/code blocks ignore .rst style substitutions.
+
+.. |course-name-short| replace:: Python300
+.. |course-name-long| replace:: Systems Programming with Python
+.. |course-term| replace:: Summer 2016
+.. |course-meeting-time| replace:: tbd
+.. |course-meeting-location| replace:: tbd
 
 .. |instructor_1_name| replace:: Rick Riehle
 .. |instructor_1_email| replace:: rriehle (at) uw (dot) edu
 
-.. |instructor_2_name| replace:: Kai Yang
-.. |instructor_2_email| replace:: hky2 (at) uw (dot) edu
+.. |instructor_2_name| replace:: tbd
+.. |instructor_2_email| replace:: tbd
 
 .. |repo-url| replace:: https://github.com/UWPCE-PythonCert/IntroPython2016a
-
 .. |gh-pages-url| replace::  http://uwpce-pythoncert.github.io/IntroPython2016a/
 
 .. |cms| replace:: https://canvas.uw.edu/courses/1026775
-
 .. |discussion-forum| replace:: https://canvas.uw.edu/courses/1026775/discussion_topics
 
-.. |office-hours-time| replace:: 10 a.m. to noon on Sundays
+.. |office-hours-time| replace:: 10 a.m. to noon on Sundays
+.. |office-hours-location| replace:: tbd

slides_sources/source/session02.rst

@@ -273,13 +273,13 @@ When you add a *remote* (existing git repository), it creates a directory with t
 
     .. code-block:: bash
 
-        $ git remote add upstream https://github.com/UWPCE-PythonCert/IntroPython2015.git
+        $ git remote add upstream https://github.com/UWPCE-PythonCert/IntroPython2016a.git
 
         $ git remote -v
-        origin  https://github.com/PythonCHB/IntroPython2015.git (fetch)
-        origin  https://github.com/PythonCHB/IntroPython2015.git (push)
-        upstream    https://github.com/UWPCE-PythonCert/IntroPython2015.git (fetch)
-        upstream    https://github.com/UWPCE-PythonCert/IntroPython2015.git (push)
+        origin https://github.com/UWPCE-PythonCert/IntroPython2016a.git (fetch)
+        origin https://github.com/UWPCE-PythonCert/IntroPython2016a.git (push)
+        upstream https://github.com/UWPCE-PythonCert/IntroPython2016a.git (fetch)
+        upstream https://github.com/UWPCE-PythonCert/IntroPython2016a.git (push)
 
 .. nextslide::
 
@@ -322,7 +322,7 @@ Start by making sure you are on your own master branch:
     $ git checkout master
 
 This is **really really** important.  Take the time to ensure you are where you
-think you are, iow, not on a remote. Use git status to find out where you are, if necesary.
+think you are, in other words, not on a remote. Use git status to see where you are.
 
 .. nextslide:: Merging Upstream Changes
 
@@ -387,12 +387,12 @@ You can incorporate this into your daily workflow: ::
 Because of the way we have set up the class, you will be able
 to see all work submitted to us from everyone in the class in 
 the students directory on your machine. This is not a bad thing.
-And the files tend to be small. 
+The files tend to be small. 
 
 We encourage sharing of knowledge in this class. Helping your
 fellow students will also help you to better understand. Share 
-your code, and get use to giving/receiving feedback on how to 
-improve your code, if you are not already.
+your code, and get used to giving and receiving feedback on how
+to improve your code, if you are not already.
 
 
 LAB: Grid Printer
@@ -455,7 +455,7 @@ Lightning Talk:
 
 .. rst-class:: center medium
 
-Brendan Fogarty
+
 
 
 Beyond Printing
@@ -482,13 +482,13 @@ Making a Decision
 .. code-block:: python
 
     if a:
-        print 'a'
+        print('a')
     elif b:
-        print 'b'
+        print('b')
     elif c:
-        print 'c'
+        print('c')
     else:
-        print 'that was unexpected'
+        print('that was unexpected')
 
 
 .. nextslide:: if
@@ -498,15 +498,15 @@ What's the difference between these two?
 .. code-block:: python
 
     if a:
-        print 'a'
+        print('a')
     elif b:
-        print 'b'
+        print('b')
 
     ## versus...
     if a:
-        print 'a'
+        print('a')
     if b:
-        print 'b'
+        print('b')
 
 
 
@@ -606,7 +606,7 @@ Lightning Talk:
 
 .. rst-class:: center medium
 
-Bruce Bauman
+
 
 
 More on Functions
@@ -963,7 +963,7 @@ Lightning Talk:
 
 .. rst-class:: center medium
 
-Michelle Yu
+
 
 
 Boolean Expressions
@@ -1209,7 +1209,7 @@ LAB: Booleans
 
     Experiment with ``locals`` by adding this statement one of the functions you wrote today::
 
-        print locals()
+        print(locals())
 
 
 Code Structure, Modules, and Namespaces
@@ -1245,7 +1245,7 @@ You can put a one-liner after the colon:
 .. code-block:: ipython
 
     In [167]: x = 12
-    In [168]: if x > 4: print x
+    In [168]: if x > 4: print(x)
     12
 
 But this should only be done if it makes your code **more** readable.
@@ -1516,11 +1516,13 @@ Next Class
 * Strings and String Formatting
 
 * Lightning talks by:
-  - Eric Rosko
-  - Michael Waddle
-  - Robert Stevens Alford
+  
+|
+|  
+|
+|
 
-Office hours: Sunday 10:00 -- 12:00
+Office hours: |office-hours-time|
 
 
 Homework

slides_sources/source/session03.rst

@@ -45,11 +45,11 @@ Lightning Talks Today:
 
 .. rst-class:: mlarge
 
-   Eric Rosko
+   John Rudolph
 
-   Michael Waddle
+   Mike Schincariol
 
-   Robert Alford
+   Chi Ho
 
 
 Sequences
@@ -272,7 +272,6 @@ Indexing past the end of a sequence will raise an error, slicing will not:
     Out[132]: "
 
 
-(demo)
 
 Membership
 ----------
@@ -455,12 +454,7 @@ Slicing LAB
 Lightning Talks
 ----------------
 
-|
-| Eric Rosko
-|
-|
-| Michael Waddle
-|
+  Ready.... go!
 
 
 Lists, Tuples...
@@ -931,6 +925,19 @@ This looks benign enough, but changing a list while you are iterating over it ca
 
 For example:
 
+.. code-block:: ipython
+
+    In [27]: l = list(range(10))
+    In [28]: l
+    Out[28]: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+    In [29]: for item in l:
+       ....:     l.remove(item)
+       ....:
+    
+.. nextslide:: Was this what you expected?
+
+For example:
+
 .. code-block:: ipython
 
     In [27]: l = list(range(10))
@@ -942,8 +949,6 @@ For example:
     In [30]: l
     Out[30]: [1, 3, 5, 7, 9]
 
-Was that what you expected?
-
 .. nextslide:: The Solution
 
 Iterate over a copy, and mutate the original:
@@ -1115,9 +1120,7 @@ Let's play a bit with Python lists...
 Lightning Talk
 ---------------
 
-|
-| Robert Alford
-|
+    Place holder...  any more?
 
 
 Iteration
@@ -1389,7 +1392,6 @@ You can also use ``str()``
     In [256]: str(34)
     Out[256]: '34'
 
-(demo)
 
 
 String Methods
@@ -1712,12 +1714,8 @@ Next Week:
 
     **Lightning talks next week:**
 
-Andrey Gusev
-
-Cheryl Ohashi
-
-Maxwell MacCamy
 
+    (Your name here)