@@ -14,7 +14,7 @@ except ImportError:
class Formatter:
def __init__(self, cost_rates, price_rates=None,
signed_currencies=(), base_fmt='#,##0.###',
rate_precision=5, denomination=None):
rate_precision=6, denomination=None):
self.cost_rates = cost_rates
self.price_rates = price_rates
self.base_fmt = base_fmt
@@ -95,27 +95,13 @@ class BeancountFormatter(Formatter):
qrate = rate
return qrate.normalize()
def normalize_enough(self, rate, curr, from_amt, to_amt, prec=None):
if prec is None:
prec = self.rate_prec
# Starting from prec, find the least amount of precision to
# make sure from_amt converts exactly to to_amt.
for try_prec in itertools.count(prec):
try_rate = self.normalize_rate(rate, try_prec)
got_amt = self.currency_decimal(from_amt * try_rate, curr)
# If got_amt == to_amt, this is enough precision to do the
# conversion exactly, so we're done.
# If try_rate == rate, there's no more precision available, so stop.
if (got_amt == to_amt) or (try_rate == rate):
break
return try_rate
def _pretty_rate(self, fmt, rate, curr, from_amt=None, to_amt=None):
if to_amt is None:
rate = self.normalize_rate(rate)
else:
rate = self.normalize_enough(rate, curr, from_amt, to_amt)
return fmt.format(self.format_currency(rate, curr, currency_digits=False))
def _pretty_rate(self, fmt, rate, curr):
rate_s = self.format_currency(
self.normalize_rate(rate),
curr,
currency_digits=False,
)
return fmt.format(rate_s)
def format_rate_pair(self, from_curr, to_curr):
from_amt = 1
@@ -151,12 +137,10 @@ class BeancountFormatter(Formatter):
if price is None:
price_s = ''
price_s = self._pretty_rate(
self.PRICE_FMT, price, denomination, amount, to_amt,
price_s = self._pretty_rate(self.PRICE_FMT, price, denomination)
return "{} {}{}".format(
amt_s,
self._pretty_rate(self.COST_FMT, cost, denomination, amount, to_amt),
self._pretty_rate(self.COST_FMT, cost, denomination),
price_s,