Ticket #34000: c10cec4352d7cfa7c848f2aaf590e1692e1b92ae.diff

django/utils/numberformat.py

@@ -25 +25 @@
         module in locale.localeconv() LC_NUMERIC grouping (e.g. (3, 2, 0)).
     * thousand_sep: Thousand separator symbol (for example ",")
     """
+    if number is None:
+        return mark_safe(None)
+    if number == "":
+        return mark_safe("")
     use_grouping = (
         use_l10n or (use_l10n is None and settings.USE_L10N)
     ) and settings.USE_THOUSAND_SEPARATOR

tests/utils_tests/test_numberformat.py

@@ -172 +172 @@
 
         price = EuroDecimal("1.23")
         self.assertEqual(nformat(price, ","), "€ 1,23")
+
+    def test_empty(self):
+        self.assertEqual(nformat(None, "."), "None")
+        self.assertEqual(nformat("", "."), "")