object patch

dabeaz · dabeaz · commit a31a9ee0f4f3 · 2020-05-28T17:52:19.000-05:00
diff --git a/Solutions/4_10/stock.py b/Solutions/4_10/stock.py
@@ -1,6 +1,6 @@
 # stock.py
 
-class Stock(object):
+class Stock:
     '''
     An instance of a stock holding consisting of name, shares, and price.
     '''
diff --git a/Solutions/4_10/tableformat.py b/Solutions/4_10/tableformat.py
@@ -1,6 +1,6 @@
 # tableformat.py
 
-class TableFormatter(object):
+class TableFormatter:
     def headings(self, headers):
         '''
         Emit the table headers
diff --git a/Solutions/4_4/stock.py b/Solutions/4_4/stock.py
@@ -1,6 +1,6 @@
 # stock.py
 
-class Stock(object):
+class Stock:
     '''
     An instance of a stock holding consisting of name, shares, and price.
     '''
diff --git a/Solutions/5_8/stock.py b/Solutions/5_8/stock.py
@@ -1,6 +1,6 @@
 # stock.py
 
-class Stock(object):
+class Stock:
     '''
     An instance of a stock holding consisting of name, shares, and price.
     '''
diff --git a/Solutions/5_8/tableformat.py b/Solutions/5_8/tableformat.py
@@ -1,6 +1,6 @@
 # tableformat.py
 
-class TableFormatter(object):
+class TableFormatter:
     def headings(self, headers):
         '''
         Emit the table headers
diff --git a/Solutions/6_12/portfolio.py b/Solutions/6_12/portfolio.py
@@ -1,6 +1,6 @@
 # portfolio.py
 
-class Portfolio(object):
+class Portfolio:
     def __init__(self, holdings):
         self._holdings = holdings
 
diff --git a/Solutions/6_12/stock.py b/Solutions/6_12/stock.py
@@ -1,6 +1,6 @@
 # stock.py
 
-class Stock(object):
+class Stock:
     '''
     An instance of a stock holding consisting of name, shares, and price.
     '''
diff --git a/Solutions/6_12/tableformat.py b/Solutions/6_12/tableformat.py
@@ -1,6 +1,6 @@
 # tableformat.py
 
-class TableFormatter(object):
+class TableFormatter:
     def headings(self, headers):
         '''
         Emit the table headers
diff --git a/Solutions/6_15/portfolio.py b/Solutions/6_15/portfolio.py
@@ -1,6 +1,6 @@
 # portfolio.py
 
-class Portfolio(object):
+class Portfolio:
     def __init__(self, holdings):
         self._holdings = holdings
 
diff --git a/Solutions/6_15/stock.py b/Solutions/6_15/stock.py
@@ -1,6 +1,6 @@
 # stock.py
 
-class Stock(object):
+class Stock:
     '''
     An instance of a stock holding consisting of name, shares, and price.
     '''
diff --git a/Solutions/6_15/tableformat.py b/Solutions/6_15/tableformat.py
@@ -1,6 +1,6 @@
 # tableformat.py
 
-class TableFormatter(object):
+class TableFormatter:
     def headings(self, headers):
         '''
         Emit the table headers
diff --git a/Solutions/6_3/portfolio.py b/Solutions/6_3/portfolio.py
@@ -1,6 +1,6 @@
 # portfolio.py
 
-class Portfolio(object):
+class Portfolio:
     def __init__(self, holdings):
         self._holdings = holdings
 
diff --git a/Solutions/6_3/stock.py b/Solutions/6_3/stock.py
@@ -1,6 +1,6 @@
 # stock.py
 
-class Stock(object):
+class Stock:
     '''
     An instance of a stock holding consisting of name, shares, and price.
     '''
diff --git a/Solutions/6_3/tableformat.py b/Solutions/6_3/tableformat.py
@@ -1,6 +1,6 @@
 # tableformat.py
 
-class TableFormatter(object):
+class TableFormatter:
     def headings(self, headers):
         '''
         Emit the table headers
diff --git a/Solutions/6_7/portfolio.py b/Solutions/6_7/portfolio.py
@@ -1,6 +1,6 @@
 # portfolio.py
 
-class Portfolio(object):
+class Portfolio:
     def __init__(self, holdings):
         self._holdings = holdings
 
diff --git a/Solutions/6_7/stock.py b/Solutions/6_7/stock.py
@@ -1,6 +1,6 @@
 # stock.py
 
-class Stock(object):
+class Stock:
     '''
     An instance of a stock holding consisting of name, shares, and price.
     '''
diff --git a/Solutions/6_7/tableformat.py b/Solutions/6_7/tableformat.py
@@ -1,6 +1,6 @@
 # tableformat.py
 
-class TableFormatter(object):
+class TableFormatter:
     def headings(self, headers):
         '''
         Emit the table headers
diff --git a/Solutions/7_11/portfolio.py b/Solutions/7_11/portfolio.py
@@ -3,7 +3,7 @@
 import fileparse
 import stock
 
-class Portfolio(object):
+class Portfolio:
     def __init__(self):
         self._holdings = []
 
diff --git a/Solutions/7_11/stock.py b/Solutions/7_11/stock.py
@@ -2,7 +2,7 @@
 
 from typedproperty import String, Integer, Float
 
-class Stock(object):
+class Stock:
     '''
     An instance of a stock holding consisting of name, shares, and price.
     '''
diff --git a/Solutions/7_11/tableformat.py b/Solutions/7_11/tableformat.py
@@ -1,6 +1,6 @@
 # tableformat.py
 
-class TableFormatter(object):
+class TableFormatter:
     def headings(self, headers):
         '''
         Emit the table headers
diff --git a/Solutions/7_11/typedproperty.py b/Solutions/7_11/typedproperty.py
@@ -20,7 +20,7 @@ def prop(self, value):
 
 # Example
 if __name__ == '__main__':
-    class Stock(object):
+    class Stock:
         name = typedproperty('name', str)
         shares = typedproperty('shares', int)
         price = typedproperty('price', float)
@@ -30,5 +30,16 @@ def __init__(self, name, shares, price):
             self.shares = shares
             self.price = price
 
+
+    class Stock2:
+        name = String('name')
+        shares = Integer('shares')
+        price = Float('price')
+
+        def __init__(self, name, shares, price):
+            self.name = name
+            self.shares = shares
+            self.price = price
+
     
 
diff --git a/Solutions/7_4/portfolio.py b/Solutions/7_4/portfolio.py
@@ -1,6 +1,6 @@
 # portfolio.py
 
-class Portfolio(object):
+class Portfolio:
     def __init__(self, holdings):
         self._holdings = holdings
 
diff --git a/Solutions/7_4/stock.py b/Solutions/7_4/stock.py
@@ -1,6 +1,6 @@
 # stock.py
 
-class Stock(object):
+class Stock:
     '''
     An instance of a stock holding consisting of name, shares, and price.
     '''
diff --git a/Solutions/7_4/tableformat.py b/Solutions/7_4/tableformat.py
@@ -1,6 +1,6 @@
 # tableformat.py
 
-class TableFormatter(object):
+class TableFormatter:
     def headings(self, headers):
         '''
         Emit the table headers
diff --git a/Solutions/7_9/portfolio.py b/Solutions/7_9/portfolio.py
@@ -1,6 +1,6 @@
 # portfolio.py
 
-class Portfolio(object):
+class Portfolio:
     def __init__(self, holdings):
         self._holdings = holdings
 
diff --git a/Solutions/7_9/stock.py b/Solutions/7_9/stock.py
@@ -2,7 +2,7 @@
 
 from typedproperty import String, Integer, Float
 
-class Stock(object):
+class Stock:
     '''
     An instance of a stock holding consisting of name, shares, and price.
     '''
diff --git a/Solutions/7_9/tableformat.py b/Solutions/7_9/tableformat.py
@@ -1,6 +1,6 @@
 # tableformat.py
 
-class TableFormatter(object):
+class TableFormatter:
     def headings(self, headers):
         '''
         Emit the table headers
diff --git a/Solutions/7_9/typedproperty.py b/Solutions/7_9/typedproperty.py
@@ -20,7 +20,7 @@ def prop(self, value):
 
 # Example
 if __name__ == '__main__':
-    class Stock(object):
+    class Stock:
         name = typedproperty('name', str)
         shares = typedproperty('shares', int)
         price = typedproperty('price', float)
@@ -30,5 +30,15 @@ def __init__(self, name, shares, price):
             self.shares = shares
             self.price = price
 
+    class Stock2:
+        name = String('name')
+        shares = Integer('shares')
+        price = Float('price')
+
+        def __init__(self, name, shares, price):
+            self.name = name
+            self.shares = shares
+            self.price = price
+
     
 
diff --git a/Solutions/8_1/portfolio.py b/Solutions/8_1/portfolio.py
@@ -3,7 +3,7 @@
 import fileparse
 import stock
 
-class Portfolio(object):
+class Portfolio:
     def __init__(self):
         self._holdings = []
 
diff --git a/Solutions/8_1/stock.py b/Solutions/8_1/stock.py
@@ -2,7 +2,7 @@
 
 from typedproperty import String, Integer, Float
 
-class Stock(object):
+class Stock:
     '''
     An instance of a stock holding consisting of name, shares, and price.
     '''
diff --git a/Solutions/8_1/tableformat.py b/Solutions/8_1/tableformat.py
@@ -1,6 +1,6 @@
 # tableformat.py
 
-class TableFormatter(object):
+class TableFormatter:
     def headings(self, headers):
         '''
         Emit the table headers
diff --git a/Solutions/8_1/typedproperty.py b/Solutions/8_1/typedproperty.py
@@ -20,7 +20,7 @@ def prop(self, value):
 
 # Example
 if __name__ == '__main__':
-    class Stock(object):
+    class Stock:
         name = typedproperty('name', str)
         shares = typedproperty('shares', int)
         price = typedproperty('price', float)
diff --git a/Solutions/8_2/portfolio.py b/Solutions/8_2/portfolio.py
@@ -3,7 +3,7 @@
 import fileparse
 import stock
 
-class Portfolio(object):
+class Portfolio:
     def __init__(self):
         self._holdings = []
 
diff --git a/Solutions/8_2/stock.py b/Solutions/8_2/stock.py
@@ -2,7 +2,7 @@
 
 from typedproperty import String, Integer, Float
 
-class Stock(object):
+class Stock:
     '''
     An instance of a stock holding consisting of name, shares, and price.
     '''
diff --git a/Solutions/8_2/tableformat.py b/Solutions/8_2/tableformat.py
@@ -1,6 +1,6 @@
 # tableformat.py
 
-class TableFormatter(object):
+class TableFormatter:
     def headings(self, headers):
         '''
         Emit the table headers
diff --git a/Solutions/8_2/typedproperty.py b/Solutions/8_2/typedproperty.py
@@ -20,7 +20,7 @@ def prop(self, value):
 
 # Example
 if __name__ == '__main__':
-    class Stock(object):
+    class Stock:
         name = typedproperty('name', str)
         shares = typedproperty('shares', int)
         price = typedproperty('price', float)
diff --git a/Solutions/9_3/porty-app/porty/portfolio.py b/Solutions/9_3/porty-app/porty/portfolio.py
@@ -3,7 +3,7 @@
 from . import fileparse
 from . import stock
 
-class Portfolio(object):
+class Portfolio:
     def __init__(self):
         self._holdings = []
 
diff --git a/Solutions/9_3/porty-app/porty/stock.py b/Solutions/9_3/porty-app/porty/stock.py
@@ -2,7 +2,7 @@
 
 from .typedproperty import String, Integer, Float
 
-class Stock(object):
+class Stock:
     '''
     An instance of a stock holding consisting of name, shares, and price.
     '''
diff --git a/Solutions/9_3/porty-app/porty/tableformat.py b/Solutions/9_3/porty-app/porty/tableformat.py
@@ -1,6 +1,6 @@
 # tableformat.py
 
-class TableFormatter(object):
+class TableFormatter:
     def headings(self, headers):
         '''
         Emit the table headers
diff --git a/Solutions/9_3/porty-app/porty/typedproperty.py b/Solutions/9_3/porty-app/porty/typedproperty.py
@@ -20,7 +20,7 @@ def prop(self, value):
 
 # Example
 if __name__ == '__main__':
-    class Stock(object):
+    class Stock:
         name = typedproperty('name', str)
         shares = typedproperty('shares', int)
         price = typedproperty('price', float)
diff --git a/Solutions/9_5/porty-app/MANIFEST.in b/Solutions/9_5/porty-app/MANIFEST.in
@@ -0,0 +1 @@
+include *.csv
diff --git a/Solutions/9_5/porty-app/README.txt b/Solutions/9_5/porty-app/README.txt
@@ -0,0 +1,17 @@
+Code from Practical Python.
+
+The "porty" directory is a Python package of code that's loaded via 
+import.  The "print-report.py" program is a top-level script that
+produces a report.  Try it:
+
+shell % python3 print-report.py portfolio.csv prices.csv txt
+      Name     Shares      Price     Change 
+---------- ---------- ---------- ---------- 
+        AA        100       9.22     -22.98 
+       IBM         50     106.28      15.18 
+       CAT        150      35.46     -47.98 
+      MSFT        200      20.89     -30.34 
+        GE         95      13.48     -26.89 
+      MSFT         50      20.89     -44.21 
+       IBM        100     106.28      35.84 
+shell %
diff --git a/Solutions/9_5/porty-app/portfolio.csv b/Solutions/9_5/porty-app/portfolio.csv
@@ -0,0 +1,8 @@
+name,shares,price
+"AA",100,32.20
+"IBM",50,91.10
+"CAT",150,83.44
+"MSFT",200,51.23
+"GE",95,40.37
+"MSFT",50,65.10
+"IBM",100,70.44
diff --git a/Solutions/9_5/porty-app/porty/__init__.py b/Solutions/9_5/porty-app/porty/__init__.py
diff --git a/Solutions/9_5/porty-app/porty/fileparse.py b/Solutions/9_5/porty-app/porty/fileparse.py
diff --git a/Solutions/9_5/porty-app/porty/follow.py b/Solutions/9_5/porty-app/porty/follow.py
diff --git a/Solutions/9_5/porty-app/porty/pcost.py b/Solutions/9_5/porty-app/porty/pcost.py
diff --git a/Solutions/9_5/porty-app/porty/portfolio.py b/Solutions/9_5/porty-app/porty/portfolio.py
diff --git a/Solutions/9_5/porty-app/porty/report.py b/Solutions/9_5/porty-app/porty/report.py
diff --git a/Solutions/9_5/porty-app/porty/stock.py b/Solutions/9_5/porty-app/porty/stock.py
diff --git a/Solutions/9_5/porty-app/porty/tableformat.py b/Solutions/9_5/porty-app/porty/tableformat.py
diff --git a/Solutions/9_5/porty-app/porty/test_stock.py b/Solutions/9_5/porty-app/porty/test_stock.py
diff --git a/Solutions/9_5/porty-app/porty/ticker.py b/Solutions/9_5/porty-app/porty/ticker.py
diff --git a/Solutions/9_5/porty-app/porty/typedproperty.py b/Solutions/9_5/porty-app/porty/typedproperty.py
diff --git a/Solutions/9_5/porty-app/prices.csv b/Solutions/9_5/porty-app/prices.csv
diff --git a/Solutions/9_5/porty-app/print-report.py b/Solutions/9_5/porty-app/print-report.py
diff --git a/Solutions/9_5/porty-app/setup.py b/Solutions/9_5/porty-app/setup.py
