Django

Code

Show
Ignore:
Timestamp:
03/23/08 12:18:58 (10 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7280-7353 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7278 to /django/trunk:1-7353
  • django/branches/gis/django/template/defaultfilters.py

    r7176 r7354  
    125125    except ValueError: 
    126126        return force_unicode(f) 
    127     m = f - int(f) 
     127    try: 
     128        m = f - int(f) 
     129    except OverflowError: 
     130        return force_unicode(f) 
    128131    if not m and d < 0: 
    129132        return mark_safe(u'%d' % int(f))