Ticket #17414: 17414-1.diff

django/utils/numberformat.py

@@ -13 +13 @@
     * thousand_sep: Thousand separator symbol (for example ",")
 
     """
-    use_grouping = force_grouping or settings.USE_L10N and \
-        settings.USE_THOUSAND_SEPARATOR and grouping
+    use_grouping = (force_grouping or settings.USE_L10N and
+        settings.USE_THOUSAND_SEPARATOR) and grouping
     # Make the common case fast:
     if isinstance(number, int) and not use_grouping and not decimal_pos:
         return mark_safe(unicode(number))

tests/regressiontests/i18n/tests.py

@@ -329 +329 @@
             self.assertEqual(u'-66666.6', nformat(-66666.666, decimal_sep='.', decimal_pos=1))
             self.assertEqual(u'-66666.0', nformat(int('-66666'), decimal_sep='.', decimal_pos=1))
             self.assertEqual(u'10000.0', nformat(self.l, decimal_sep='.', decimal_pos=1))
+            # The weird grouping/force_grouping combination may be triggered by intcomma filter (#17414)
+            self.assertEqual(u'10000', nformat(self.l, decimal_sep='.', decimal_pos=0, grouping=0, force_grouping=True))
 
             # date filter
             self.assertEqual(u'31.12.2009 в 20:50', Template('{{ dt|date:"d.m.Y в H:i" }}').render(self.ctxt))