Author: jacob
Date: 2009-10-12 11:57:01 -0500 (Mon, 12 Oct 2009)
New Revision: 11620

Modified:
   django/branches/releases/1.1.X/django/template/defaultfilters.py
Log:
[1.1.X] Fixed #11993: fixed the the floatformat filter on NaN values in Python 
2.6.3. Thanks, kklimonda. Backport if [11619] from trunk.


Modified: django/branches/releases/1.1.X/django/template/defaultfilters.py
===================================================================
--- django/branches/releases/1.1.X/django/template/defaultfilters.py    
2009-10-12 16:53:23 UTC (rev 11619)
+++ django/branches/releases/1.1.X/django/template/defaultfilters.py    
2009-10-12 16:57:01 UTC (rev 11620)
@@ -162,7 +162,7 @@
 
     try:
         m = int(d) - d
-    except (OverflowError, InvalidOperation):
+    except (ValueError, OverflowError, InvalidOperation):
         return input_val
 
     if not m and p < 0:


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to