Merge branch 'master' into cohensauw-patch-1

Author: PythonCHB

source/_static/UWPCE_logo_W.png

@@ -27,8 +27,8 @@ Exercises:
     ../exercises/slicing.rst
     ../exercises/list_lab.rst
     ../exercises/string_formatting.rst
-    ../exercises/mailroom-part1.rst
-    ../exercises/mailroom_tutorial.rst
+    ../exercises/mailroom/mailroom.rst
+    ../exercises/mailroom/mailroom_tutorial.rst
 
 Optional
 --------

source/_static/UWPCE_logo_full.png

@@ -36,7 +36,9 @@ Exercises:
 
     ../exercises/exceptions_lab.rst
     ../exercises/except_exercise.rst
-    ../exercises/unit_testing.rst
+    ../exercises/unit_testing/unit_testing.rst
     ../exercises/dict_lab.rst
-    ../exercises/mailroom-part2.rst
-    ../exercises/kata_fourteen.rst
+    ../exercises/mailroom/mailroom_with_dicts.rst
+    ../exercises/trigrams/trigrams.rst
+
+

source/class_schedule/lesson03.rst

@@ -28,5 +28,7 @@ Exercises:
     ../exercises/exceptions_lab.rst
     ../exercises/except_exercise.rst
     ../exercises/comprehensions_lab.rst
-    ../exercises/mailroom-part3.rst
+    ../exercises/mailroom/mailroom_with_exceptions.rst
+    ../exercises/mailroom/mailroom_with_files.rst
+
 

source/class_schedule/lesson04.rst

@@ -31,7 +31,7 @@ Exercises:
     :maxdepth: 1
 
     ../exercises/args_kwargs_lab.rst
-    ../exercises/mailroom-part4.rst
+    ../exercises/mailroom/mailroom_with_tests.rst
 
-**NOTE:** you will find that most introductions to unit testing with Python use the built in ``unittest`` module. However, it is a bit heavyweight, and requires some knowledge of OOP -- classes, etc. So we'll be using pytest in this class:
+**NOTE:** you will find that most introductions to unit testing with Python use the built in ``unittest`` module. However, it is a bit heavyweight, and requires some knowledge of OOP -- classes, etc. So we use pytest in this class:
 http://doc.pytest.org/en/latest/. But the principles of testing are the same.

source/class_schedule/lesson05.rst

@@ -38,7 +38,7 @@ Exercises:
 .. toctree::
     :maxdepth: 1
 
-    ../exercises/circle_class.rst
+    ../exercises/circle/circle_class.rst
 
 Optional Exercise:
 ------------------

source/class_schedule/lesson06.rst

@@ -39,4 +39,4 @@ Exercises:
 .. toctree::
     :maxdepth: 1
 
-    ../exercises/mailroom-oo.rst
+    ../exercises/mailroom/mailroom-oo.rst

source/class_schedule/lesson08.rst

@@ -33,7 +33,7 @@ def test_shuffle():
     """
     seq = list(range(10))
     random.shuffle(seq)
-    # seq.sort()  # If you comment this out, it will fail, so you can see output
+    seq.sort()  # If you comment this out, it will fail, so you can see output
     print("seq:", seq)  # only see output if it fails
     assert seq == list(range(10))
 
@@ -45,6 +45,7 @@ def test_shuffle_immutable():
     with pytest.raises(TypeError):
         random.shuffle((1, 2, 3))
 
+
 def test_sample_too_large():
     """
     Trying to sample more than exist should raise an error