Skip to content

Commit 952a2c0

Browse files
committed
exercise 2.16
1 parent 599a16b commit 952a2c0

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

Work/report.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@ def read_portfolio(filename):
1111
header = next(rows)
1212
for row in rows:
1313
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)
2120

2221
return portfolio
2322

@@ -35,23 +34,23 @@ def read_prices(filename):
3534

3635
return prices
3736

38-
def make_report(portfolio, price):
37+
def make_report(portfolio, prices):
3938
rows = []
4039
for stock in portfolio:
41-
curr_price = price[stock["name"]]
40+
curr_price = prices[stock["name"]]
4241
change = curr_price - float(stock["price"])
4342
summary = (stock["name"], int(stock["shares"]), curr_price, change)
4443
rows.append(summary)
4544

4645
return rows
4746

4847

49-
portfolio = read_portfolio('Data/portfolio.csv')
48+
portfolio = read_portfolio('Data/portfoliodate.csv')
5049
#portfolio = read_portfolio(input("Enter the filename: "))
51-
price = read_prices('Data/prices.csv')
50+
prices = read_prices('Data/prices.csv')
5251

5352

54-
report = make_report(portfolio, price)
53+
report = make_report(portfolio, prices)
5554
header = ('Name', 'Shares', 'Price', 'Change')
5655
print("%10s %10s %10s %10s" %header)
5756
print(("-" * 10 + " ") * len(header))

0 commit comments

Comments
 (0)