@@ -1,25 +1,33 @@

 #!/usr/bin/env python

 # -*- coding: utf-8 -*-

+"""

+boobank-accounts takes one or several JSON files, as created by boobank-cacher

+when running and caching a "boobank list" command, and display their contents.

+"""

-import os

-import sys

-import json

 import time

 import argparse

 from prettytable import PrettyTable

 from termcolor import colored

-from boobank_utils import *

+from boobank_utils import format_amount, format_timestamp_colored, load_json

+from boobank_utils import DEFAULT_CURRENCY, COLORING_THRESHOLD, MAX_AGE

 def parse_args():

-    args_parser = argparse.ArgumentParser(description='Display the contents of cached "boobank list" JSON files.')

+    """

+    Parse command-line arguments.

+    """

+    description = 'Display the contents of cached "boobank list" JSON files.'

+    args_parser = argparse.ArgumentParser(description)

     args_parser.add_argument('json_file', nargs='*', default=['-'], help='JSON files to display')

     return args_parser.parse_args()

 def main():

+    """

+    Main function.

+    """

     args = parse_args()

     table = get_table()

     total = 0

-    timestamps = {}

     filepaths = set(args.json_file)

     for filepath in filepaths:

         accounts = load_json(filepath)

@@ -34,21 +42,27 @@ def main():

     print(total_line)

 def get_table():

-    pt = PrettyTable()

-    pt.field_names = ['Account ID', 'Account name', 'Balance', 'Data cached on']

-    pt.field_names = [colored(x, 'white', attrs=['bold']) for x in pt.field_names]

-    pt.align = 'r'

-    pt.align[pt.field_names[1]] = 'l'

-    pt.align[pt.field_names[3]] = 'c'

-    return pt

+    """

+    Create and return the PrettyTable instance used to display data.

+    """

+    ptable = PrettyTable()

+    ptable.field_names = ['Account ID', 'Account name', 'Balance', 'Data cached on']

+    ptable.field_names = [colored(x, 'white', attrs=['bold']) for x in ptable.field_names]

+    ptable.align = 'r'

+    ptable.align[ptable.field_names[1]] = 'l'

+    ptable.align[ptable.field_names[3]] = 'c'

+    return ptable

 def add_account(table, account, cache_timestamp):

-    id = colored(account.get('id'), 'cyan')

+    """

+    Add the given bank account to the given PrettyTable instance.

+    """

+    account_id = colored(account.get('id'), 'cyan')

     label = colored(account.get('label'), 'cyan')

     currency = account.get('currency', DEFAULT_CURRENCY)

     balance = format_amount(account['balance'], currency, COLORING_THRESHOLD)

     cache_date = format_timestamp_colored(cache_timestamp, MAX_AGE)

-    table.add_row([id, label, balance, cache_date])

+    table.add_row([account_id, label, balance, cache_date])

 if __name__ == '__main__':

     main()