fix on uuid encoder

phenobarbital · Apr 7, 2022 · 5dc1857 · 5dc1857
1 parent 8ef6bd5
commit 5dc1857
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/asyncdb/utils/encoders.py b/asyncdb/utils/encoders.py
@@ -99,33 +99,30 @@ def default(self, obj):
             return str(obj)
         elif isinstance(obj, timedelta):
             return obj.__str__()
-        elif hasattr(obj, "hex"):
-            return obj.hex
         elif isinstance(obj, Enum):
             if not obj.value:
                 return None
             else:
                 return str(obj.value)
         elif isinstance(obj, uuid.UUID):
             try:
+                return str(obj)
+            except ValueError:
                 if uobj := uuid.UUID(obj, version=4):
                     return str(uobj)
-            except ValueError:
-                return str(obj)
         elif isinstance(obj, decimal.Decimal):
             return float(obj)
         elif isinstance(obj, Decimal):
             return str(obj)
         elif hasattr(obj, "isoformat"):
-            try:
-                return obj.isoformat()
-            except TypeError:
-                return None
+            return obj.isoformat()
         elif isinstance(obj, asyncpg.Range):
             return [obj.lower, obj.upper]
+        elif hasattr(obj, "hex"):
+            return obj.hex
         else:
             # return str(obj)
-            raise TypeError("%r is not JSON serializable" % obj)
+            raise TypeError(f"{obj!r} is not JSON serializable")
 
 
 class BaseEncoder: