diff options
Diffstat (limited to 'python/Dawn/utils.py')
| -rw-r--r-- | python/Dawn/utils.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/python/Dawn/utils.py b/python/Dawn/utils.py index 8fa45e93..9a2cf37f 100644 --- a/python/Dawn/utils.py +++ b/python/Dawn/utils.py @@ -1,19 +1,19 @@ -import pandas as pd -import os import re from pickle import dumps + def bump_rev(filename): - pattern = "([^r]*)(\srev(\d)|).pdf" - begin, _, rev_number = re.match(pattern, filename).groups() + pattern = r"([^r]*)(\srev(\d)|).pdf" + begin, _, rev_number = re.match(pattern, filename).groups() rev_number = int(rev_number) + 1 if rev_number else 1 - return "{0} rev{1}.pdf".format(begin, rev_number) + return f"{begin} rev{rev_number}.pdf" + def simple_serialize(obj): - d = {c.name: getattr(obj, c.name) for c in obj.__table__.columns} + d = {c.name: getattr(obj, c.name) for c in obj.__table__.columns} # add data from foreign relationship if obj.__table__.name == 'wires': d.update({'Counterparty': obj.account.counterparty, - 'cashaccount': obj.account.cash_account, - 'custodian': obj.account.custodian}) + 'cashaccount': obj.account.cash_account, + 'custodian': obj.account.custodian}) return dumps(d) |