Sourcery refactored master branch

Solutions/1_10/mortgage.py

@@ -16,11 +16,11 @@
     total_paid = total_paid + payment
 
     if month >= extra_payment_start_month and month <= extra_payment_end_month:
-        principal = principal - extra_payment
+        principal -= extra_payment
         total_paid = total_paid + extra_payment
 
     print(month, round(total_paid,2), round(principal, 2))
-    
+
 print('Total paid', round(total_paid, 2))
 print('Months', month)
 

Solutions/1_33/pcost.py

@@ -22,10 +22,6 @@ def portfolio_cost(filename):
     return total_cost
 
 import sys
-if len(sys.argv) == 2:
-    filename = sys.argv[1]
-else:
-    filename = input('Enter a filename:')
-
+filename = sys.argv[1] if len(sys.argv) == 2 else input('Enter a filename:')
 cost = portfolio_cost(filename)
 print('Total cost:', cost)

Solutions/1_5/bounce.py

@@ -1,8 +1,6 @@
 # bounce.py
 
 height = 100
-bounce = 1
-while bounce <= 10:
+for bounce in range(1, 11):
     height = height * (3/5)
     print(bounce, round(height, 4))
-    bounce += 1

Solutions/2_16/pcost.py

@@ -23,10 +23,6 @@ def portfolio_cost(filename):
     return total_cost
 
 import sys
-if len(sys.argv) == 2:
-    filename = sys.argv[1]
-else:
-    filename = input('Enter a filename:')
-
+filename = sys.argv[1] if len(sys.argv) == 2 else input('Enter a filename:')
 cost = portfolio_cost(filename)
 print('Total cost:', cost)

Solutions/3_10/fileparse.py

@@ -39,10 +39,7 @@ def parse_csv(filename, select=None, types=None, has_headers=True, delimiter=','
                     continue
 
             # Make a dictionary or a tuple
-            if headers:
-                record = dict(zip(headers, row))
-            else:
-                record = tuple(row)
+            record = dict(zip(headers, row)) if headers else tuple(row)
             records.append(record)
 
         return records

Solutions/3_14/fileparse.py

@@ -39,10 +39,7 @@ def parse_csv(filename, select=None, types=None, has_headers=True, delimiter=','
                     continue
 
             # Make a dictionary or a tuple
-            if headers:
-                record = dict(zip(headers, row))
-            else:
-                record = tuple(row)
+            record = dict(zip(headers, row)) if headers else tuple(row)
             records.append(record)
 
         return records

Solutions/3_14/pcost.py

@@ -7,13 +7,9 @@ def portfolio_cost(filename):
     Computes the total cost (shares*price) of a portfolio file
     '''
     portfolio = report.read_portfolio(filename)
-    return sum([s['shares']*s['price'] for s in portfolio])
+    return sum(s['shares']*s['price'] for s in portfolio)
 
 import sys
-if len(sys.argv) == 2:
-    filename = sys.argv[1]
-else:
-    filename = input('Enter a filename:')
-
+filename = sys.argv[1] if len(sys.argv) == 2 else input('Enter a filename:')
 cost = portfolio_cost(filename)
 print('Total cost:', cost)

Solutions/3_16/fileparse.py

@@ -39,10 +39,7 @@ def parse_csv(filename, select=None, types=None, has_headers=True, delimiter=','
                     continue
 
             # Make a dictionary or a tuple
-            if headers:
-                record = dict(zip(headers, row))
-            else:
-                record = tuple(row)
+            record = dict(zip(headers, row)) if headers else tuple(row)
             records.append(record)
 
         return records

Solutions/3_16/pcost.py

@@ -7,11 +7,11 @@ def portfolio_cost(filename):
     Computes the total cost (shares*price) of a portfolio file
     '''
     portfolio = report.read_portfolio(filename)
-    return sum([s['shares'] * s['price'] for s in portfolio])
+    return sum(s['shares'] * s['price'] for s in portfolio)
 
 def main(args):
     if len(args) != 2:
-        raise SystemExit('Usage: %s portfoliofile' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfoliofile')
     filename = args[1]
     print('Total cost:', portfolio_cost(filename))
 

Solutions/3_16/report.py

@@ -54,7 +54,7 @@ def portfolio_report(portfoliofile, pricefile):
 
 def main(args):
     if len(args) != 3:
-        raise SystemExit('Usage: %s portfile pricefile' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfile pricefile')
     portfolio_report(args[1], args[2])
 
 if __name__ == '__main__':

Solutions/3_18/fileparse.py

@@ -38,10 +38,7 @@ def parse_csv(lines, select=None, types=None, has_headers=True, delimiter=',', s
                 continue
 
         # Make a dictionary or a tuple
-        if headers:
-            record = dict(zip(headers, row))
-        else:
-            record = tuple(row)
+        record = dict(zip(headers, row)) if headers else tuple(row)
         records.append(record)
 
     return records

Solutions/3_18/pcost.py

@@ -7,11 +7,11 @@ def portfolio_cost(filename):
     Computes the total cost (shares*price) of a portfolio file
     '''
     portfolio = report.read_portfolio(filename)
-    return sum([s['shares'] * s['price'] for s in portfolio])
+    return sum(s['shares'] * s['price'] for s in portfolio)
 
 def main(args):
     if len(args) != 2:
-        raise SystemExit('Usage: %s portfoliofile' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfoliofile')
     filename = args[1]
     print('Total cost:', portfolio_cost(filename))
 

Solutions/3_18/report.py

@@ -56,7 +56,7 @@ def portfolio_report(portfoliofile, pricefile):
 
 def main(args):
     if len(args) != 3:
-        raise SystemExit('Usage: %s portfile pricefile' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfile pricefile')
     portfolio_report(args[1], args[2])
 
 if __name__ == '__main__':

Solutions/3_7/fileparse.py

@@ -30,10 +30,7 @@ def parse_csv(filename, select=None, types=None, has_headers=True, delimiter=','
                 row = [func(val) for func, val in zip(types, row)]
 
             # Make a dictionary or a tuple
-            if headers:
-                record = dict(zip(headers, row))
-            else:
-                record = tuple(row)
+            record = dict(zip(headers, row)) if headers else tuple(row)
             records.append(record)
 
         return records

Solutions/4_10/fileparse.py

@@ -38,10 +38,7 @@ def parse_csv(lines, select=None, types=None, has_headers=True, delimiter=',', s
                 continue
 
         # Make a dictionary or a tuple
-        if headers:
-            record = dict(zip(headers, row))
-        else:
-            record = tuple(row)
+        record = dict(zip(headers, row)) if headers else tuple(row)
         records.append(record)
 
     return records

Solutions/4_10/pcost.py

@@ -7,11 +7,11 @@ def portfolio_cost(filename):
     Computes the total cost (shares*price) of a portfolio file
     '''
     portfolio = report.read_portfolio(filename)
-    return sum([s.cost() for s in portfolio])
+    return sum(s.cost() for s in portfolio)
 
 def main(args):
     if len(args) != 2:
-        raise SystemExit('Usage: %s portfoliofile' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfoliofile')
     filename = args[1]
     print('Total cost:', portfolio_cost(filename))
 

Solutions/4_10/report.py

@@ -14,8 +14,7 @@ def read_portfolio(filename):
                                         select=['name','shares','price'], 
                                         types=[str,int,float])
 
-    portfolio = [ Stock(d['name'], d['shares'], d['price']) for d in portdicts ]
-    return portfolio
+    return [ Stock(d['name'], d['shares'], d['price']) for d in portdicts ]
 
 def read_prices(filename):
     '''
@@ -63,7 +62,7 @@ def portfolio_report(portfoliofile, pricefile, fmt='txt'):
 
 def main(args):
     if len(args) != 4:
-        raise SystemExit('Usage: %s portfile pricefile format' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfile pricefile format')
     portfolio_report(args[1], args[2], args[3])
 
 if __name__ == '__main__':

Solutions/4_4/fileparse.py

@@ -38,10 +38,7 @@ def parse_csv(lines, select=None, types=None, has_headers=True, delimiter=',', s
                 continue
 
         # Make a dictionary or a tuple
-        if headers:
-            record = dict(zip(headers, row))
-        else:
-            record = tuple(row)
+        record = dict(zip(headers, row)) if headers else tuple(row)
         records.append(record)
 
     return records

Solutions/4_4/pcost.py

@@ -7,11 +7,11 @@ def portfolio_cost(filename):
     Computes the total cost (shares*price) of a portfolio file
     '''
     portfolio = report.read_portfolio(filename)
-    return sum([s.cost() for s in portfolio])
+    return sum(s.cost() for s in portfolio)
 
 def main(args):
     if len(args) != 2:
-        raise SystemExit('Usage: %s portfoliofile' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfoliofile')
     filename = args[1]
     print('Total cost:', portfolio_cost(filename))
 

Solutions/4_4/report.py

@@ -13,8 +13,7 @@ def read_portfolio(filename):
                                         select=['name','shares','price'], 
                                         types=[str,int,float])
 
-    portfolio = [ Stock(d['name'], d['shares'], d['price']) for d in portdicts ]
-    return portfolio
+    return [ Stock(d['name'], d['shares'], d['price']) for d in portdicts ]
 
 def read_prices(filename):
     '''
@@ -62,7 +61,7 @@ def portfolio_report(portfoliofile, pricefile):
 
 def main(args):
     if len(args) != 3:
-        raise SystemExit('Usage: %s portfile pricefile' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfile pricefile')
     portfolio_report(args[1], args[2])
 
 if __name__ == '__main__':

Solutions/5_8/fileparse.py

@@ -38,10 +38,7 @@ def parse_csv(lines, select=None, types=None, has_headers=True, delimiter=',', s
                 continue
 
         # Make a dictionary or a tuple
-        if headers:
-            record = dict(zip(headers, row))
-        else:
-            record = tuple(row)
+        record = dict(zip(headers, row)) if headers else tuple(row)
         records.append(record)
 
     return records

Solutions/5_8/pcost.py

@@ -7,11 +7,11 @@ def portfolio_cost(filename):
     Computes the total cost (shares*price) of a portfolio file
     '''
     portfolio = report.read_portfolio(filename)
-    return sum([s.cost() for s in portfolio])
+    return sum(s.cost() for s in portfolio)
 
 def main(args):
     if len(args) != 2:
-        raise SystemExit('Usage: %s portfoliofile' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfoliofile')
     filename = args[1]
     print('Total cost:', portfolio_cost(filename))
 

Solutions/5_8/report.py

@@ -14,8 +14,7 @@ def read_portfolio(filename):
                                         select=['name','shares','price'], 
                                         types=[str,int,float])
 
-    portfolio = [ Stock(d['name'], d['shares'], d['price']) for d in portdicts ]
-    return portfolio
+    return [ Stock(d['name'], d['shares'], d['price']) for d in portdicts ]
 
 def read_prices(filename):
     '''
@@ -63,7 +62,7 @@ def portfolio_report(portfoliofile, pricefile, fmt='txt'):
 
 def main(args):
     if len(args) != 4:
-        raise SystemExit('Usage: %s portfile pricefile format' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfile pricefile format')
     portfolio_report(args[1], args[2], args[3])
 
 if __name__ == '__main__':

Solutions/6_12/fileparse.py

@@ -38,10 +38,7 @@ def parse_csv(lines, select=None, types=None, has_headers=True, delimiter=',', s
                 continue
 
         # Make a dictionary or a tuple
-        if headers:
-            record = dict(zip(headers, row))
-        else:
-            record = tuple(row)
+        record = dict(zip(headers, row)) if headers else tuple(row)
         records.append(record)
 
     return records

Solutions/6_12/pcost.py

@@ -11,7 +11,7 @@ def portfolio_cost(filename):
 
 def main(args):
     if len(args) != 2:
-        raise SystemExit('Usage: %s portfoliofile' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfoliofile')
     filename = args[1]
     print('Total cost:', portfolio_cost(filename))
 

Solutions/6_12/portfolio.py

@@ -14,11 +14,11 @@ def __getitem__(self, index):
         return self._holdings[index]
 
     def __contains__(self, name):
-        return any([s.name == name for s in self._holdings])
+        return any(s.name == name for s in self._holdings)
 
     @property
     def total_cost(self):
-        return sum([s.shares * s.price for s in self._holdings])
+        return sum(s.shares * s.price for s in self._holdings)
 
     def tabulate_shares(self):
         from collections import Counter

Solutions/6_12/report.py

@@ -64,7 +64,7 @@ def portfolio_report(portfoliofile, pricefile, fmt='txt'):
 
 def main(args):
     if len(args) != 4:
-        raise SystemExit('Usage: %s portfile pricefile format' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfile pricefile format')
     portfolio_report(args[1], args[2], args[3])
 
 if __name__ == '__main__':

Solutions/6_12/ticker.py

@@ -42,7 +42,7 @@ def ticker(portfile, logfile, fmt):
 
 def main(args):
     if len(args) != 4:
-        raise SystemExit('Usage: %s portfoliofile logfile fmt' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfoliofile logfile fmt')
     ticker(args[1], args[2], args[3])
 
 if __name__ == '__main__':

Solutions/6_15/fileparse.py

@@ -38,10 +38,7 @@ def parse_csv(lines, select=None, types=None, has_headers=True, delimiter=',', s
                 continue
 
         # Make a dictionary or a tuple
-        if headers:
-            record = dict(zip(headers, row))
-        else:
-            record = tuple(row)
+        record = dict(zip(headers, row)) if headers else tuple(row)
         records.append(record)
 
     return records

Solutions/6_15/pcost.py

@@ -11,7 +11,7 @@ def portfolio_cost(filename):
 
 def main(args):
     if len(args) != 2:
-        raise SystemExit('Usage: %s portfoliofile' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfoliofile')
     filename = args[1]
     print('Total cost:', portfolio_cost(filename))
 

Solutions/6_15/report.py

@@ -64,7 +64,7 @@ def portfolio_report(portfoliofile, pricefile, fmt='txt'):
 
 def main(args):
     if len(args) != 4:
-        raise SystemExit('Usage: %s portfile pricefile format' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfile pricefile format')
     portfolio_report(args[1], args[2], args[3])
 
 if __name__ == '__main__':

Solutions/6_15/ticker.py

@@ -36,7 +36,7 @@ def ticker(portfile, logfile, fmt):
 
 def main(args):
     if len(args) != 4:
-        raise SystemExit('Usage: %s portfoliofile logfile fmt' % args[0])
+        raise SystemExit(f'Usage: {args[0]} portfoliofile logfile fmt')
     ticker(args[1], args[2], args[3])
 
 if __name__ == '__main__':