Fix arbitrary limit on dates.

Dates can now be in the year-range 1-9999 for all backends except
metakit which is still limited to 1970-2038.

Author: Ralf Schlatterbeck

CHANGES.txt

@@ -2,6 +2,9 @@ This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
 2007-??-??
+Feature:
+- Dates can now be in the year-range 1-9999 except for metakit which is
+  still limited to 1970-2038.
 Fixed:
 - Handling of unset Link search in RDBMS backend
 

roundup/date.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: date.py,v 1.89 2006-12-28 22:38:02 richard Exp $
+# $Id: date.py,v 1.90 2007-03-09 10:25:09 schlatterbeck Exp $
 
 """Date, time and time interval handling.
 """
@@ -263,7 +263,6 @@ def __init__(self, spec='.', offset=0, add_granularity=0, translator=i18n):
         elif isinstance(spec, datetime.datetime):
             # Python 2.3+ datetime object
             y,m,d,H,M,S,x,x,x = spec.timetuple()
-            if y < 1970: raise ValueError, 'year must be > 1970'
             S += spec.microsecond/1000000.
             spec = (y,m,d,H,M,S,x,x,x)
         elif hasattr(spec, 'tuple'):
@@ -272,7 +271,6 @@ def __init__(self, spec='.', offset=0, add_granularity=0, translator=i18n):
             spec = spec.get_tuple()
         try:
             y,m,d,H,M,S,x,x,x = spec
-            if y < 1970: raise ValueError, 'year must be > 1970'
             frac = S - int(S)
             self.year, self.month, self.day, self.hour, self.minute, \
                 self.second = _local_to_utc(y, m, d, H, M, S, offset)
@@ -309,20 +307,16 @@ def set(self, spec, offset=0, date_re=date_re,
             _add_granularity(info, 'SMHdmyab')
 
         # get the current date as our default
-        ts = time.time()
-        frac = ts - int(ts)
-        y,m,d,H,M,S,x,x,x = time.gmtime(ts)
-        # gmtime loses the fractional seconds
-        S = S + frac
-        if str(S) == '60.0': S = 59.9
+        dt = datetime.datetime.utcnow()
+        y,m,d,H,M,S,x,x,x = dt.timetuple()
+        S += dt.microsecond/1000000.
 
         # whether we need to convert to UTC
         adjust = False
 
         if info['y'] is not None or info['a'] is not None:
             if info['y'] is not None:
                 y = int(info['y'])
-                if y < 1970: raise ValueError, 'year must be > 1970'
                 m,d = (1,1)
                 if info['m'] is not None:
                     m = int(info['m'])
@@ -344,20 +338,19 @@ def set(self, spec, offset=0, date_re=date_re,
                 S = float(info['S'])
             adjust = True
 
-        if add_granularity:
-            S = S - 1
 
         # now handle the adjustment of hour
         frac = S - int(S)
-        ts = calendar.timegm((y,m,d,H,M,S,0,0,0))
-        y, m, d, H, M, S, x, x, x = time.gmtime(ts)
+        dt = datetime.datetime(y,m,d,H,M,int(S), int(frac * 1000000.))
+        if add_granularity:
+            dt = dt - datetime.timedelta(seconds=1)
+        y, m, d, H, M, S, x, x, x = dt.timetuple()
         if adjust:
             y, m, d, H, M, S = _local_to_utc(y, m, d, H, M, S, offset)
         self.year, self.month, self.day, self.hour, self.minute, \
             self.second = y, m, d, H, M, S
         # we lost the fractional part along the way
-        self.second = self.second + frac
-        if str(self.second) == '60.0': self.second = 59.9
+        self.second += dt.microsecond/1000000.
 
         if info.get('o', None):
             try:
@@ -493,7 +486,7 @@ def __str__(self):
         return self.formal()
 
     def formal(self, sep='.', sec='%02d'):
-        f = '%%4d-%%02d-%%02d%s%%02d:%%02d:%s'%(sep, sec)
+        f = '%%04d-%%02d-%%02d%s%%02d:%%02d:%s'%(sep, sec)
         return f%(self.year, self.month, self.day, self.hour, self.minute,
             self.second)
 
@@ -503,13 +496,10 @@ def pretty(self, format='%d %B %Y'):
             Note that if the day is zero, and the day appears first in the
             format, then the day number will be removed from output.
         '''
-        # Python2.4 strftime() enforces the non-zero-ness of the day-of-year
-        # component of the time tuple, so we need to figure it out
-        t = (self.year, self.month, self.day, self.hour, self.minute,
-            int(self.second), 0, 0, 0)
-        t = calendar.timegm(t)
-        t = time.gmtime(t)
-        str = time.strftime(format, t)
+        dt = datetime.datetime(self.year, self.month, self.day, self.hour,
+            self.minute, int(self.second),
+            (self.second - int (self.second)) * 1000000.)
+        str = dt.strftime(format)
 
         # handle zero day by removing it
         if format.startswith('%d') and str[0] == '0':
@@ -535,7 +525,7 @@ def get_tuple(self):
             self.second, 0, 0, 0)
 
     def serialise(self):
-        return '%4d%02d%02d%02d%02d%06.3f'%(self.year, self.month,
+        return '%04d%02d%02d%02d%02d%06.3f'%(self.year, self.month,
             self.day, self.hour, self.minute, self.second)
 
     def timestamp(self):

test/db_test_base.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: db_test_base.py,v 1.82 2006-11-11 03:21:12 richard Exp $
+# $Id: db_test_base.py,v 1.83 2007-03-09 10:25:10 schlatterbeck Exp $
 
 import unittest, os, shutil, errno, imp, sys, time, pprint, sets
 
@@ -277,6 +277,15 @@ def testDateChange(self):
             if commit: self.db.commit()
             self.assertNotEqual(a, b)
             self.assertNotEqual(b, date.Date('1970-1-1.00:00:00'))
+            # The 1970 date will fail for metakit -- it is used
+            # internally for storing NULL. The others would, too
+            # because metakit tries to convert date.timestamp to an int
+            # for storing and fails with an overflow.
+            for d in [date.Date (x) for x in '2038', '1970', '0033', '9999']:
+                self.db.issue.set(nid, deadline=d)
+                if commit: self.db.commit()
+                c = self.db.issue.get(nid, "deadline")
+                self.assertEqual(c, d)
 
     def testDateUnset(self):
         for commit in (0,1):

test/test_dates.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: test_dates.py,v 1.39 2006-05-06 17:21:34 a1s Exp $
+# $Id: test_dates.py,v 1.40 2007-03-09 10:25:10 schlatterbeck Exp $
 from __future__ import nested_scopes
 
 import unittest, time
@@ -59,11 +59,13 @@ def testDate(self):
         ae(str(date), '%s-%02d-%02d.08:47:11'%(y, m, d))
         ae(str(Date('2003')), '2003-01-01.00:00:00')
         ae(str(Date('2004-06')), '2004-06-01.00:00:00')
+        ae(str(Date('1900-02-01')), '1900-02-01.00:00:00')
+        ae(str(Date('1800-07-15')), '1800-07-15.00:00:00')
 
     def testDateError(self):
         self.assertRaises(ValueError, Date, "12")
-        # Date cannot handle dates before UNIX epoch
-        self.assertRaises(ValueError, Date, (1, 1, 1, 0, 0, 0.0, 0, 1, -1))
+        # Date cannot handle dates before year 1
+        self.assertRaises(ValueError, Date, (0, 1, 1, 0, 0, 0.0, 0, 1, -1))
         self.assertRaises(ValueError, Date, "1/1/06")
 
     def testOffset(self):
@@ -128,6 +130,8 @@ def testOffsetAdd(self):
         ae(str(date), '2000-02-29.00:00:00')
         date = Date('2001-02-28.22:58:59') + Interval('00:00:3661')
         ae(str(date), '2001-03-01.00:00:00')
+        date = Date('2001-03-01.00:00:00') + Interval('150y')
+        ae(str(date), '2151-03-01.00:00:00')
 
     def testOffsetSub(self):
         ae = self.assertEqual
@@ -162,6 +166,8 @@ def testOffsetSub(self):
         ae(str(date), '2000-02-28.22:58:59')
         date = Date('2001-03-01.00:00:00') - Interval('00:00:3661')
         ae(str(date), '2001-02-28.22:58:59')
+        date = Date('2001-03-01.00:00:00') - Interval('150y')
+        ae(str(date), '1851-03-01.00:00:00')
 
     def testDateLocal(self):
         ae = self.assertEqual
@@ -269,6 +275,10 @@ def testDateSubtract(self):
         # force the transition over a year boundary
         i = Date('2003-01-01.00:00:00') - Date('2002-01-01.00:00:00')
         self.assertEqual(i, Interval('365d'))
+        i = Date('1952-01-01') - Date('1953-01-01')
+        self.assertEqual(i, Interval('-366d'))
+        i = Date('1953-01-01') - Date('1952-01-01')
+        self.assertEqual(i, Interval('366d'))
 
     def testIntervalAdd(self):
         ae = self.assertEqual
@@ -389,6 +399,8 @@ def testPyDatetime(self):
             return
         d = datetime.datetime.now()
         Date(d)
+        toomuch = datetime.MAXYEAR + 1
+        self.assertRaises(ValueError, Date, (toomuch, 1, 1, 0, 0, 0, 0, 1, -1))
 
     def testSimpleTZ(self):
         ae = self.assertEqual
@@ -404,6 +416,31 @@ def testSimpleTZ(self):
         date = Date(date, 2)
         ae(str(date), '2006-04-04.10:00:00')
 
+    def testTimestamp(self):
+        ae = self.assertEqual
+        date = Date('2038')
+        ae(date.timestamp(), 2145916800)
+        date = Date('1902')
+        ae(date.timestamp(), -2145916800)
+        try:
+            from time import gmtime
+        except:
+            return
+        date = Date(gmtime(0))
+        ae(date.timestamp(), 0)
+        ae(str(date), '1970-01-01.00:00:00')
+        date = Date(gmtime(0x7FFFFFFF))
+        ae(date.timestamp(), 2147483647)
+        ae(str(date), '2038-01-19.03:14:07')
+        date = Date('1901-12-13.20:45:52')
+        ae(date.timestamp(), -0x80000000L)
+        ae(str(date), '1901-12-13.20:45:52')
+        date = Date('9999')
+        ae (date.timestamp(), 253370764800.0)
+        date = Date('0033')
+        ae (date.timestamp(), -61125753600.0)
+        ae(str(date), '0033-01-01.00:00:00')
+
 class TimezoneTestCase(unittest.TestCase):
 
     def testTZ(self):