X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=type%2Fcentcount.py;h=e78d068910e8281cbf28ee8674e7b6cff44f89fd;hb=532df2c5b57c7517dfb3dddd8c1358fbadf8baf3;hp=4e5b8a6aa6b4b8ef61671b93b0284825cdf75cbc;hpb=83c1e0d04fe2e78963c8b508e8b7d0ae03bfcb16;p=python_utils.git

diff --git a/type/centcount.py b/type/centcount.py
index 4e5b8a6..e78d068 100644
--- a/type/centcount.py
+++ b/type/centcount.py
@@ -1,12 +1,14 @@
 #!/usr/bin/env python3
 
-import re
-from typing import Optional, TypeVar, Tuple
+# © Copyright 2021-2022, Scott Gasch
 
-import math_utils
+"""An amount of money (USD) represented as an integral count of
+cents."""
 
+import re
+from typing import Optional, Tuple
 
-T = TypeVar('T', bound='CentCount')
+import math_utils
 
 
 class CentCount(object):
@@ -15,13 +17,7 @@ class CentCount(object):
     issues by treating amount as a simple integral count of cents.
     """
 
-    def __init__ (
-            self,
-            centcount,
-            currency: str = 'USD',
-            *,
-            strict_mode = False
-    ):
+    def __init__(self, centcount, currency: str = 'USD', *, strict_mode=False):
         self.strict_mode = strict_mode
         if isinstance(centcount, str):
             ret = CentCount._parse(centcount)
@@ -37,7 +33,7 @@ class CentCount(object):
         if not currency:
             self.currency: Optional[str] = None
         else:
-            self.currency: Optional[str] = currency
+            self.currency = currency
 
     def __repr__(self):
         a = float(self.centcount)
@@ -45,9 +41,9 @@ class CentCount(object):
         a = round(a, 2)
         s = f'{a:,.2f}'
         if self.currency is not None:
-            return '%s %s' % (s, self.currency)
+            return f'{s} {self.currency}'
         else:
-            return '$%s' % s
+            return f'${s}'
 
     def __pos__(self):
         return CentCount(centcount=self.centcount, currency=self.currency)
@@ -59,8 +55,8 @@ class CentCount(object):
         if isinstance(other, CentCount):
             if self.currency == other.currency:
                 return CentCount(
-                    centcount = self.centcount + other.centcount,
-                    currency = self.currency
+                    centcount=self.centcount + other.centcount,
+                    currency=self.currency,
                 )
             else:
                 raise TypeError('Incompatible currencies in add expression')
@@ -74,8 +70,8 @@ class CentCount(object):
         if isinstance(other, CentCount):
             if self.currency == other.currency:
                 return CentCount(
-                    centcount = self.centcount - other.centcount,
-                    currency = self.currency
+                    centcount=self.centcount - other.centcount,
+                    currency=self.currency,
                 )
             else:
                 raise TypeError('Incompatible currencies in add expression')
@@ -90,8 +86,8 @@ class CentCount(object):
             raise TypeError('can not multiply monetary quantities')
         else:
             return CentCount(
-                centcount = int(self.centcount * float(other)),
-                currency = self.currency
+                centcount=int(self.centcount * float(other)),
+                currency=self.currency,
             )
 
     def __truediv__(self, other):
@@ -99,8 +95,8 @@ class CentCount(object):
             raise TypeError('can not divide monetary quantities')
         else:
             return CentCount(
-                centcount = int(float(self.centcount) / float(other)),
-                currency = self.currency
+                centcount=int(float(self.centcount) / float(other)),
+                currency=self.currency,
             )
 
     def __int__(self):
@@ -125,8 +121,8 @@ class CentCount(object):
         if isinstance(other, CentCount):
             if self.currency == other.currency:
                 return CentCount(
-                    centcount = other.centcount - self.centcount,
-                    currency = self.currency
+                    centcount=other.centcount - self.centcount,
+                    currency=self.currency,
                 )
             else:
                 raise TypeError('Incompatible currencies in sub expression')
@@ -135,8 +131,8 @@ class CentCount(object):
                 raise TypeError('In strict_mode only two moneys can be added')
             else:
                 return CentCount(
-                    centcount = int(other) - self.centcount,
-                    currency = self.currency
+                    centcount=int(other) - self.centcount,
+                    currency=self.currency,
                 )
 
     __rmul__ = __mul__
@@ -148,10 +144,7 @@ class CentCount(object):
         if other is None:
             return False
         if isinstance(other, CentCount):
-            return (
-                self.centcount == other.centcount and
-                self.currency == other.currency
-            )
+            return self.centcount == other.centcount and self.currency == other.currency
         if self.strict_mode:
             raise TypeError("In strict mode only two CentCounts can be compared")
         else:
@@ -193,11 +186,11 @@ class CentCount(object):
     def __ge__(self, other):
         return self > other or self == other
 
-    def __hash__(self):
-        return self.__repr__
+    def __hash__(self) -> int:
+        return hash(self.__repr__)
 
-    CENTCOUNT_RE = re.compile("^([+|-]?)(\d+)(\.\d+)$")
-    CURRENCY_RE = re.compile("^[A-Z][A-Z][A-Z]$")
+    CENTCOUNT_RE = re.compile(r"^([+|-]?)(\d+)(\.\d+)$")
+    CURRENCY_RE = re.compile(r"^[A-Z][A-Z][A-Z]$")
 
     @classmethod
     def _parse(cls, s: str) -> Optional[Tuple[int, str]]:
@@ -220,7 +213,7 @@ class CentCount(object):
         return None
 
     @classmethod
-    def parse(cls, s: str) -> T:
+    def parse(cls, s: str) -> 'CentCount':
         chunks = CentCount._parse(s)
         if chunks is not None:
             return CentCount(chunks[0], chunks[1])