Changeset 1502

Timestamp:

09/27/08 08:47:18 (2 months ago)

Author:

mattknox_ca

Message:

added support for parsing year information by itself

Files:

• trunk/timeseries/scikits/timeseries/parser.py (modified) (4 diffs)
• trunk/timeseries/scikits/timeseries/tests/test_dates.py (modified) (1 diff)

trunk/timeseries/scikits/timeseries/parser.py

@@ -104 +104 @@
-_isotime = _hour + ':?' + _minute + ':?' + _second + '? *' + _zone + '?'
-
+_yeardate = _year
-_weekdate = _year + '-?(?:' + _week + '-?' + _day + '?)?'
-_eurodate = _day + '\.' + _month + '\.' + _year_epoch + '?'
@@ -160 +161 @@
-_altisodateRE = re.compile(_altisodate, re.I)
-_usisodateRE = re.compile(_usisodate, re.I)
+_yeardateRE = re.compile(_yeardate, re.I)
-_eurodateRE = re.compile(_eurodate, re.I)
-_usdateRE = re.compile(_usdate, re.I)
@@ -180 +182 @@
-                 'iso', 'altiso',
-                 'lit', 'altlit', 'eurlit',
-
+year', '
-
-# Available time parsers
@@ -389 +391 @@
-                    match = None
-                    continue
+                break
+
+        elif format == 'year':
+            # just a year specified
+            match = _yeardateRE.match(text)
+            if match is not None:
+                year = match.groups()[0]
+                if year:
+                    if len(year) == 2:
+                        # Y2K problem:
+                        year = add_century(int(year))
+                    else:
+                        year = int(year)
+                else:
+                    defaultdate = now()
+                    year = defaultdate.year
+                day = 1
+                month = 1
-                break
-

trunk/timeseries/scikits/timeseries/tests/test_dates.py

@@ -59 +59 @@
-        assert_equal(dates, 24073 + np.arange(12))
-        print "finished test_fromstrings"
+
+        # quarterly date
+        assert_equal(
+            Date(freq='Q', string='2007-01'),
+            Date(freq='Q', year=2007, quarter=1))
+
+        # just a year
+        assert_equal(Date(freq='A', string='2007'), Date(freq='A', year=2007))
-
-