Merge branch 'master' into fix-typos

Author: qDoer

Notes/01_Introduction/02_Hello_world.md

@@ -58,7 +58,7 @@ interact with the interpreter.
 Let's take a closer look at the elements of the REPL:
 
 - `>>>` is the interpreter prompt for starting a new statement.
-- `...` is the interpreter prompt for continuing a statements. Enter a blank line to finish typing and run the statements.
+- `...` is the interpreter prompt for continuing a statement. Enter a blank line to finish typing and run what you've entered.
 
 The `...` prompt may or may not be shown depending on your environment. For this course,
 it is shown as blanks to make it easier to cut/paste code samples.

Notes/01_Introduction/06_Files.md

@@ -228,7 +228,7 @@ Try it:
 >>>
 ```
 
-### Commentary:  Shouldn't we be using Pandas for this?
+### Commentary:  Shouldn't we being using Pandas for this?
 
 Data scientists are quick to point out that libraries like
 [Pandas](https://pandas.pydata.org) already have a function for

Notes/02_Working_with_data/02_Containers.md

@@ -52,9 +52,10 @@ An example when reading records from a file.
 records = []  # Initial empty list
 
 with open('Data/portfolio.csv', 'rt') as f:
+    next(f) # Skip header
     for line in f:
         row = line.split(',')
-        records.append((row[0], int(row[1])), float(row[2]))
+        records.append((row[0], int(row[1]), float(row[2])))
 ```
 
 ### Dicts as a Container
@@ -105,6 +106,11 @@ with open('Data/prices.csv', 'rt') as f:
         prices[row[0]] = float(row[1])
 ```
 
+Note: If you try this on the `Data/prices.csv` file, you'll find that
+it almost works--there's a blank line at the end that causes it to
+crash.  You'll need to figure out some way to modify the code to
+account for that (see Exercise 2.6).
+
 ### Dictionary Lookups
 
 You can test the existence of a key.

Notes/02_Working_with_data/06_List_comprehension.md

@@ -80,7 +80,7 @@ for variable_name in sequence:
 
 ### Historical Digression
 
-List comprehension come from math (set-builder notation).
+List comprehensions come from math (set-builder notation).
 
 ```code
 a = [ x * x for x in s if x > 0 ] # Python

Notes/05_Object_model/01_Dicts_revisited.md

@@ -7,7 +7,7 @@ involving dictionaries.  This section discusses that.
 
 ### Dictionaries, Revisited
 
-Remember that a dictionary is a collection of names values.
+Remember that a dictionary is a collection of named values.
 
 ```python
 stock = {
@@ -58,7 +58,7 @@ A dictionary holds the instance data, `__dict__`.
 ```python
 >>> s = Stock('GOOG', 100, 490.1)
 >>> s.__dict__
-{'name' : 'GOOG','shares' : 100, 'price': 490.1 }
+{'name' : 'GOOG', 'shares' : 100, 'price': 490.1 }
 ```
 
 You populate this dict (and instance) when assigning to `self`.
@@ -271,7 +271,7 @@ e = E()
 e.attr
 ```
 
-A attribute search process is carried out, but what is the order? That's a problem.
+An attribute search process is carried out, but what is the order? That's a problem.
 
 Python uses *cooperative multiple inheritance* which obeys some rules
 about class ordering.