version 20260216.1, fixes formatter for numbers and dates

Author: mdipierro

pydal/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "20260118.1"
+__version__ = "20260216.1"
 
 from .base import DAL
 from .helpers.classes import SQLCustomType

pydal/objects.py

@@ -587,11 +587,9 @@ def _enable_record_versioning(
         )
 
         self._before_update.append(
-            lambda qset,
-            fs,
-            db=archive_db,
-            an=archive_name,
-            cn=current_record: archive_record(qset, fs, db[an], cn)
+            lambda qset, fs, db=archive_db, an=archive_name, cn=current_record: (
+                archive_record(qset, fs, db[an], cn)
+            )
         )
         if is_active and is_active in fieldnames:
             self._before_delete.append(lambda qset: qset.update(is_active=False))

pydal/validators.py

@@ -1033,8 +1033,8 @@ def validate(self, value, record_id=None):
         )
 
     def formatter(self, value):
-        if value is None:
-            return None
+        if value in (None, ""):
+            return value
         return str2dec(value).replace(".", self.dot)
 
 
@@ -1115,8 +1115,8 @@ def validate(self, value, record_id=None):
         )
 
     def formatter(self, value):
-        if value is None:
-            return None
+        if value in (None, ""):
+            return value
         return str2dec(value).replace(".", self.dot)
 
 
@@ -1429,8 +1429,8 @@ def validate(self, value, record_id=None):
         return values
 
     def formatter(self, value):
-        if not value:
-            return ""
+        if value in (None, ""):
+            return value
         if isinstance(value, list):
             return ", ".join(map(quote_token, value))
         return str(value)
@@ -3879,8 +3879,8 @@ def validate(self, value, record_id=None):
             raise ValidationError(self.translator(self.error_message) % self.extremes)
 
     def formatter(self, value):
-        if value is None or value == "":
-            return None
+        if value in (None, ""):
+            return value
         format = str(self.format)
         year = value.year
         y = "%.4i" % year
@@ -3956,8 +3956,8 @@ def validate(self, value, record_id=None):
             raise ValidationError(self.translator(self.error_message) % self.extremes)
 
     def formatter(self, value):
-        if value is None or value == "":
-            return None
+        if value in (None, ""):
+            return value
         format = str(self.format)
         year = value.year
         y = "%.4i" % year
@@ -4117,8 +4117,8 @@ def validate(self, value, record_id=None):
         return value
 
     def formatter(self, value):
-        if not value:
-            return ""
+        if value in (None, ""):
+            return value
         if isinstance(value, list):
             return ", ".join(map(quote_token, map(self.other.fomatter, value)))
         return str(value)
@@ -4344,6 +4344,8 @@ def validate(self, value, record_id=None):
         return validator_caller(self.other, value, record_id)
 
     def formatter(self, value):
+        if value in (None, ""):
+            return value
         if hasattr(self.other, "formatter"):
             return self.other.formatter(value)
         return value