Django

Code

Show
Ignore:
Timestamp:
07/19/08 08:30:47 (6 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7921,7926-7928,7938-7941,7945-7947,7949-7950,7952,7955-7956,7961,7964-7968,7970-7978 via svnmerge from trunk.

This includes the newforms-admin branch, and thus is backwards-incompatible. The geographic admin is _not_ in this changeset, and is forthcoming.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7917 to /django/trunk:1-7978

  • django/branches/gis/django/utils/tzinfo.py

    r7279 r7979  
    6161        try: 
    6262            stamp = time.mktime(tt) 
    63         except OverflowError: 
    64             # 32 bit systems can't handle dates after Jan 2038, so we fake it 
    65             # in that case (since we only care about the DST flag here). 
     63        except (OverflowError, ValueError): 
     64            # 32 bit systems can't handle dates after Jan 2038, and certain 
     65            # systems can't handle dates before ~1901-12-01: 
     66            # 
     67            # >>> time.mktime((1900, 1, 13, 0, 0, 0, 0, 0, 0)) 
     68            # OverflowError: mktime argument out of range 
     69            # >>> time.mktime((1850, 1, 13, 0, 0, 0, 0, 0, 0)) 
     70            # ValueError: year out of range 
     71            # 
     72            # In this case, we fake the date, because we only care about the 
     73            # DST flag. 
    6674            tt = (2037,) + tt[1:] 
    6775            stamp = time.mktime(tt)