Changeset 7948 for django/branches/newforms-admin/django/utils
- Timestamp:
- 07/18/08 10:47:10 (4 months ago)
- Files:
-
- django/branches/newforms-admin (modified) (1 prop)
- django/branches/newforms-admin/django/utils/datetime_safe.py (copied) (copied from django/trunk/django/utils/datetime_safe.py)
- django/branches/newforms-admin/django/utils/tzinfo.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/newforms-admin
- Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7943 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7947
django/branches/newforms-admin/django/utils/tzinfo.py
r7233 r7948 61 61 try: 62 62 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. 66 74 tt = (2037,) + tt[1:] 67 75 stamp = time.mktime(tt)
