Updating example code to address various errors

bslatkin · bslatkin · commit 1ce625e697b0 · 2020-05-31T14:42:13.000-07:00
diff --git a/example_code/item_04.py b/example_code/item_04.py
@@ -234,7 +234,7 @@ def close_open_files():
     'Today\'s soup is %(soup)s, '
     'buy one get two %(oyster)s oysters, '
     'and our special entrée is %(special)s.')
-old_formatted = template % {
+old_formatted = old_template % {
     'soup': 'lentil',
     'oyster': 'kumamoto',
     'special': 'schnitzel',
diff --git a/example_code/item_34.py b/example_code/item_34.py
@@ -77,7 +77,7 @@ def my_generator():
     received = yield 1
     print(f'received = {received}')
 
-it = iter(my_generator())
+it = my_generator()
 output = next(it)       # Get first generator output
 print(f'output = {output}')
 
@@ -90,7 +90,7 @@ def my_generator():
 
 
 # Example 4
-it = iter(my_generator())
+it = my_generator()
 output = it.send(None)  # Get first generator output
 print(f'output = {output}')
 
diff --git a/example_code/item_48.py b/example_code/item_48.py
@@ -54,7 +54,7 @@ def __new__(meta, name, bases, class_dict):
         print(f'* Running {meta}.__new__ for {name}')
         print('Bases:', bases)
         print = pprint
-        print(class_dict)        
+        print(class_dict)
         print = orig_print
         return type.__new__(meta, name, bases, class_dict)
 
@@ -124,7 +124,7 @@ class BetterPolygon:
     def __init_subclass__(cls):
         super().__init_subclass__()
         if cls.sides < 3:
-            raise ValueError('Polygons need 3+ sides')  
+            raise ValueError('Polygons need 3+ sides')
 
     @classmethod
     def interior_angles(cls):
@@ -238,24 +238,24 @@ class Filled:
     def __init_subclass__(cls):
         super().__init_subclass__()
         if cls.color not in ('red', 'green', 'blue'):
-            raise ValueError('Fills need a valid color')  
+            raise ValueError('Fills need a valid color')
 
 
 # Example 13
-class RedTriangle(Filled, Polygon):
+class RedTriangle(Filled, BetterPolygon):
     color = 'red'
     sides = 3
 
 ruddy = RedTriangle()
 assert isinstance(ruddy, Filled)
-assert isinstance(ruddy, Polygon)
+assert isinstance(ruddy, BetterPolygon)
 
 
 # Example 14
 try:
     print('Before class')
     
-    class BlueLine(Filled, Polygon):
+    class BlueLine(Filled, BetterPolygon):
         color = 'blue'
         sides = 2
     
@@ -270,7 +270,7 @@ class BlueLine(Filled, Polygon):
 try:
     print('Before class')
     
-    class BeigeSquare(Filled, Polygon):
+    class BeigeSquare(Filled, BetterPolygon):
         color = 'beige'
         sides = 4
     
diff --git a/example_code/item_58.py b/example_code/item_58.py
@@ -194,6 +194,10 @@ def game_logic(state, neighbors):
 
 
 # Example 5
+# Clear the sentinel object from the out queue
+for _ in out_queue:
+    pass
+
 # Restore the working version of this function
 def game_logic(state, neighbors):
     if state == ALIVE:
diff --git a/example_code/item_78.py b/example_code/item_78.py
@@ -269,7 +269,7 @@ def do_rounds(database, species, *, utcnow=datetime.utcnow):
 
     for name, last_mealtime in animals:
         if (now - last_mealtime) > feeding_timedelta:
-            feed_func(database, name, now)
+            feed_animal(database, name, now)
             fed += 1
 
     return fed
@@ -297,9 +297,9 @@ def do_rounds(database, species, *, utcnow=datetime.utcnow):
     result = do_rounds(database, 'Meerkat', utcnow=now_func)
     assert result == 2
 
-    food_func.assert_called_once_with(database, 'Meerkat')
-    animals_func.assert_called_once_with(database, 'Meerkat')
-    feed_func.assert_has_calls(
+    get_food_period.assert_called_once_with(database, 'Meerkat')
+    get_animals.assert_called_once_with(database, 'Meerkat')
+    feed_animal.assert_has_calls(
         [
             call(database, 'Spot', now_func.return_value),
             call(database, 'Fluffy', now_func.return_value),
