From 1f83711c268cf4d3b9d441a6bf4ab20172878c57 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Fri, 19 Apr 2019 20:02:44 +0200 Subject: [PATCH] util/Fiat: Fiat(No Data) should equal Fiat(No Data) Decimal('NaN') != Decimal('NaN') matters in e.g. qt history tab refresh (shortcut) --- electrum/util.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/electrum/util.py b/electrum/util.py index 58f1cd992..c88a50318 100644 --- a/electrum/util.py +++ b/electrum/util.py @@ -161,9 +161,11 @@ class Satoshis(object): class Fiat(object): __slots__ = ('value', 'ccy') - def __new__(cls, value, ccy): + def __new__(cls, value: Optional[Decimal], ccy: str): self = super(Fiat, cls).__new__(cls) self.ccy = ccy + if not isinstance(value, (Decimal, type(None))): + raise TypeError(f"value should be Decimal or None, not {type(value)}") self.value = value return self @@ -177,7 +179,12 @@ class Fiat(object): return "{:.2f}".format(self.value) def __eq__(self, other): - return self.ccy == other.ccy and self.value == other.value + if self.ccy != other.ccy: + return False + if isinstance(self.value, Decimal) and isinstance(other.value, Decimal) \ + and self.value.is_nan() and other.value.is_nan(): + return True + return self.value == other.value def __ne__(self, other): return not (self == other)