end of 4.3

sortolavi · sortolavi · commit b2368c33927e · 2026-02-09T16:35:04.000+02:00
diff --git a/Work/stock.py b/Work/stock.py
@@ -7,6 +7,12 @@ def __init__(self, name, shares, price):
         self.shares = shares
         self.price = price
 
+    # without this, the print of a Stock object is not very informative
+    # [<stock.Stock object at 0x0000022C9F7C9FD0>, <stock.Stock object at ...>]
+
+    def __repr__(self):
+        return f"Stock({self.name}, {self.shares}, {self.price})"
+
     def cost(self):
         cost = self.shares * self.price
         return cost
diff --git a/Work/tableformat.py b/Work/tableformat.py
@@ -78,3 +78,23 @@ def create_formatter(fmt):
     else:
         raise ValueError(f'Unknown format: {fmt}')
     
+
+
+def print_table(data, cols, fmt):
+    '''
+    Print a table of data using the specified format.
+    
+    :param data: A list of stock objects containing the table data.
+    :param cols: A list of column names to be used as headings in the table.
+    :param fmt: A string indicating the desired format ('txt', 'csv', 'html').
+    '''
+    
+    fmt.headings(cols)
+    
+    for d in data:
+        rowdata = [str(getattr(d, colname)) for colname in cols] # ['AA', 100]
+        # rowdata = [str(item) for item in rowdata]  # ['AA', '100']
+        
+        fmt.row(rowdata)
+
+
diff --git a/Work/using_report.py b/Work/using_report.py
@@ -12,6 +12,9 @@
 
 pf_file = '.\\Data\\portfolio.csv'
 
+portfolio = r.read_portfolio(pf_file)
+print(portfolio)
+
 print(f'{pf_file:-^43s}')
 r.portfolio_report(pf_file, price_file)
 print()
diff --git a/Work/using_stock.py b/Work/using_stock.py
@@ -4,7 +4,11 @@
 
 
 a = stock.Stock('GOOG',100,490.10)
-print(a.name)
+print(a)
+columns = ['name', 'shares']
+for colname in columns:
+        print(colname, '=', getattr(a, colname))
+        
 
 b = stock.Stock('AAPL', 50, 122.34)
 c = stock.Stock('IBM', 75, 91.75)
@@ -26,14 +30,14 @@
 
 
 
-with open ('.\\Data\\portfolio.csv') as lines:
-    portdicts = fileparse.parse_csv(lines, select=['name','shares','price'], types=[str,int,float])
+# with open ('.\\Data\\portfolio.csv') as lines:
+#     portdicts = fileparse.parse_csv(lines, select=['name','shares','price'], types=[str,int,float])
 
-print(portdicts)
+# print(portdicts)
 
-portfolio = [ stock.Stock(d['name'], d['shares'], d['price']) for d in portdicts]
+# portfolio = [ stock.Stock(d['name'], d['shares'], d['price']) for d in portdicts]
 
-pf_cost = sum([s.cost() for s in portfolio])
-print (f'Total cost: {pf_cost}')
+# pf_cost = sum([s.cost() for s in portfolio])
+# print (f'Total cost: {pf_cost}')
 
 
diff --git a/Work/using_tableformat.py b/Work/using_tableformat.py
@@ -0,0 +1,16 @@
+
+
+import report as r
+import tableformat as tf
+
+
+pf_file = '.\\Data\\portfolio.csv'
+
+portfolio = r.read_portfolio(pf_file)
+formatter = tf.create_formatter('txt')
+
+tf.print_table(portfolio, ['name','shares'], formatter)
+
+tf.print_table(portfolio, ['name','shares','price'], formatter)
+
+tf.print_table(portfolio, ['name','price'], formatter)
