Changeset 1220

Timestamp:

08/11/08 17:41:46 (3 months ago)

Author:

mattknox_ca

Message:

fix bug when prevbusday called on a weekend returning incorrect date

Files:

• trunk/timeseries/scikits/timeseries/tdates.py (modified) (4 diffs)

trunk/timeseries/scikits/timeseries/tdates.py

@@ -110 +110 @@
-    If it is currently Saturday or Sunday, then the preceding Friday will be
-    returned. If it is later than the specified ``day_end_hour`` and ``day_end_min``,
- 
+
-    Otherwise, ``now('Business')-1`` will be returned.
-
@@ -117 +117 @@
-    dateNum = tempDate.hour + float(tempDate.minute)/60
-    checkNum = day_end_hour + float(day_end_min)/60
-
+ and tempDate.weekday() < 5
-        return now(_c.FR_BUS) - 1
-    else:
@@ -185 +185 @@
-    When viewed element-wise, DateArray is a sequence of dates.
-    For example, a test such as :
-
+
-    >>> DateArray(...) = value
-
+
-    will be valid only if value is an integer, not a Date
-    However, a loop such as :
-
+
-    >>> for d in DateArray(...):
-
+
-    accesses the array element by element. Therefore, `d` is a Date object.
-    """
@@ -411 +411 @@
-    def asfreq(self, freq=None, relation="END"):
-        """
-
+
-    Converts the dates to another frequency.
-