Merge remote-tracking branch 'upstream/master'

pmb dev · pmb dev · commit dc4b91140781 · 2020-06-07T17:19:49.000-05:00
diff --git a/Notes/01_Introduction/02_Hello_world.md b/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.
diff --git a/Notes/01_Introduction/03_Numbers.md b/Notes/01_Introduction/03_Numbers.md
@@ -106,8 +106,9 @@ x ** y     Power
 abs(x)     Absolute Value
 ```
 
-TYPO 
-Theses are the same operators as Integers, except for the bit-wise operators.
+
+These are the same operators as Integers, except for the bit-wise operators.
+
 Additional math functions are found in the `math` module.
 
 
@@ -236,15 +237,16 @@ The output should look something like this:
 4 10736.44 497581.83
 5 13420.55 496970.98
 ...
-308 875705.88 674.44
-309 878389.99 -2006.86
-Total paid 878389.99
-Months 309
+308 874705.88 2971.43
+309 877389.99 299.7
+310 880074.1 -2383.16
+Total paid 880074.1
+Months 310
 ```
 
 ### Exercise 1.11: Bonus
 
-While you’re at it, fix the program to correct the for overpayment that occurs in the last month.
+While you’re at it, fix the program to correct for the overpayment that occurs in the last month.
 
 ### Exercise 1.12: A Mystery
 
diff --git a/Notes/01_Introduction/04_Strings.md b/Notes/01_Introduction/04_Strings.md
@@ -2,7 +2,7 @@
 
 # 1.4 Strings
 
-This section introduces way to work with text.
+This section introduces ways to work with text.
 
 ### Representing Literal Text
 
@@ -134,7 +134,7 @@ t = s.replace('Hello' , 'Hallo')   # 'Hallo world'
 **More string methods:**
 
 Strings have a wide variety of other methods for testing and manipulating the text data.
-This is small sample of methods:
+This is a small sample of methods:
 
 ```python
 s.endswith(suffix)     # Check if string ends with suffix
diff --git a/Notes/01_Introduction/06_Files.md b/Notes/01_Introduction/06_Files.md
@@ -220,14 +220,17 @@ Try it:
 
 ```python
 >>> import gzip
->>> with gzip.open('Data/portfolio.csv.gz') as f:
+>>> with gzip.open('Data/portfolio.csv.gz', 'rt') as f:
     for line in f:
         print(line, end='')
 
 ... look at the output ...
 >>>
 ```
 
+Note: Including the file mode of `'rt'` is critical here.  If you forget that,
+you'll get byte strings instead of normal text strings.
+
 ### Commentary:  Shouldn't we being using Pandas for this?
 
 Data scientists are quick to point out that libraries like
diff --git a/Notes/02_Working_with_data/01_Datatypes.md b/Notes/02_Working_with_data/01_Datatypes.md
@@ -58,7 +58,7 @@ Sometimes the `()` are omitted in the syntax.
 s = 'GOOG', 100, 490.1
 ```
 
-Special cases (0-tuple, 1-typle).
+Special cases (0-tuple, 1-tuple).
 
 ```python
 t = ()            # An empty tuple
diff --git a/Notes/02_Working_with_data/02_Containers.md b/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.
@@ -335,7 +341,7 @@ accessed by key names instead of numeric column numbers.  This is
 often preferred because the resulting code is easier to read later.
 
 Viewing large dictionaries and lists can be messy. To clean up the
-output for debugging, considering using the `pprint` function.
+output for debugging, consider using the `pprint` function.
 
 ```python
 >>> from pprint import pprint
@@ -437,9 +443,9 @@ interactively to make sure it works:
 ### Exercise 2.7: Finding out if you can retire
 
 Tie all of this work together by adding a few additional statements to
-your `report.py` program that compute gain/loss. These statements
+your `report.py` program that computes gain/loss. These statements
 should take the list of stocks in Exercise 2.5 and the dictionary of
-prices in Exercise 2.6 and computes the current value of the portfolio
+prices in Exercise 2.6 and compute the current value of the portfolio
 along with the gain/loss.
 
 [Contents](../Contents.md) \| [Previous (2.1 Datatypes)](01_Datatypes.md) \| [Next (2.3 Formatting)](03_Formatting.md)
diff --git a/Notes/02_Working_with_data/06_List_comprehension.md b/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
diff --git a/Notes/03_Program_organization/06_Design_discussion.md b/Notes/03_Program_organization/06_Design_discussion.md
@@ -110,7 +110,7 @@ with any file-like/iterable object.  For example:
 >>> with gzip.open('Data/portfolio.csv.gz', 'rt') as file:
 ...      port = fileparse.parse_csv(file, types=[str,int,float])
 ...
->>> lines = ['name,shares,price', 'AA,34.23,100', 'IBM,50,91.1', 'HPE,75,45.1']
+>>> lines = ['name,shares,price', 'AA,100,34.23', 'IBM,50,91.1', 'HPE,75,45.1']
 >>> port = fileparse.parse_csv(lines, types=[str,int,float])
 >>>
 ```
diff --git a/Notes/04_Classes_objects/01_Class.md b/Notes/04_Classes_objects/01_Class.md
@@ -143,7 +143,7 @@ If you want to operate on an instance, you always refer to it explicitly (e.g.,
 ## Exercises
 
 Starting with this set of exercises, we start to make a series of
-changes to existing code from previous sctions.  It is critical that
+changes to existing code from previous sections.  It is critical that
 you have a working version of Exercise 3.18 to start.  If you don't
 have that, please work from the solution code found in the
 `Solutions/3_18` directory.  It's fine to copy it.
diff --git a/Notes/05_Object_model/01_Dicts_revisited.md b/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.
diff --git a/Solutions/1_10/mortgage.py b/Solutions/1_10/mortgage.py
@@ -15,7 +15,7 @@
     principal = principal * (1+rate/12) - payment
     total_paid = total_paid + payment
 
-    if month >= extra_payment_start_month and month <= extra_payment_end_month:
+    if month >= extra_payment_start_month and month < extra_payment_end_month:
         principal = principal - extra_payment
         total_paid = total_paid + extra_payment
 
