@@ -11,13 +11,12 @@ def read_portfolio(filename):
11
11
header = next (rows )
12
12
for row in rows :
13
13
record = dict (zip (header , row ))
14
- # Remove the following section when zipping records
15
- # stock = {
16
- # "name": row[0],
17
- # "shares": int(row[1]),
18
- # "price": float(row[2]),
19
- # }
20
- portfolio .append (record )
14
+ stock = {
15
+ "name" : record ["name" ],
16
+ "shares" : int (record ["shares" ]),
17
+ "price" : float (record ["price" ]),
18
+ }
19
+ portfolio .append (stock )
21
20
22
21
return portfolio
23
22
@@ -35,23 +34,23 @@ def read_prices(filename):
35
34
36
35
return prices
37
36
38
- def make_report (portfolio , price ):
37
+ def make_report (portfolio , prices ):
39
38
rows = []
40
39
for stock in portfolio :
41
- curr_price = price [stock ["name" ]]
40
+ curr_price = prices [stock ["name" ]]
42
41
change = curr_price - float (stock ["price" ])
43
42
summary = (stock ["name" ], int (stock ["shares" ]), curr_price , change )
44
43
rows .append (summary )
45
44
46
45
return rows
47
46
48
47
49
- portfolio = read_portfolio ('Data/portfolio .csv' )
48
+ portfolio = read_portfolio ('Data/portfoliodate .csv' )
50
49
#portfolio = read_portfolio(input("Enter the filename: "))
51
- price = read_prices ('Data/prices.csv' )
50
+ prices = read_prices ('Data/prices.csv' )
52
51
53
52
54
- report = make_report (portfolio , price )
53
+ report = make_report (portfolio , prices )
55
54
header = ('Name' , 'Shares' , 'Price' , 'Change' )
56
55
print ("%10s %10s %10s %10s" % header )
57
56
print (("-" * 10 + " " ) * len (header ))
0 commit comments