Changeset 1518

Timestamp:

09/30/08 23:46:55 (2 months ago)

Author:

pierregm

Message:

* make sure that a reshaping of the dates is not propagated

Files:

• trunk/timeseries/scikits/timeseries/tests/test_timeseries.py (modified) (2 diffs)
• trunk/timeseries/scikits/timeseries/tseries.py (modified) (4 diffs)

trunk/timeseries/scikits/timeseries/tests/test_timeseries.py

@@ -601 +601 @@
-        assert_equal(test1D._series.shape, newshape)
-        assert_equal(test1D._dates.shape, newshape)
+        # Make sure we haven't propagated the new shape
+        self.failUnless(test1D.shape != series1D.shape)
+        self.failUnless(test1D._dates.shape != series1D._dates.shape)
-        # Using .shape
-        test1D = series1D.copy()
@@ -607 +610 @@
-        assert_equal(test1D._series.shape, newshape)
-        assert_equal(test1D._dates.shape, newshape)
+        self.failUnless(series1D._dates.shape != newshape)
-        # Using multiple args
-        test1D = series1D.reshape(*newshape)

trunk/timeseries/scikits/timeseries/tseries.py

@@ -465 +465 @@
-        # Only update the dates if we don't have any
-        if not getattr(_dates, 'size', 0):
-dates = newdates
+_setdates__(newdates)
-        MaskedArray._update_from(self, obj)
-
@@ -636 +636 @@
-    def __setattr__(self, attr, value):
-        if attr in ['_dates','dates']:
-
+return 
-        elif attr == 'shape':
-            if self._varshape:
-                err_msg = "Reshaping a nV/nD series is not implemented yet !"
-                raise NotImplementedError(err_msg)
+            else:
+                self._dates.shape = value
-        return ndarray.__setattr__(self, attr, value)
-
@@ -668 +670 @@
-        elif not varshape:
-            # The data is 1D
-
+
+
-        return super(TimeSeries, self).__setattr__('_dates', value)
-
@@ -1596 +1599 @@
-    newseries = tmpdata.view(type(series))
-    newseries._varshape = newvarshape
-
-
-
+
-    newseries._update_from(series)
-    return newseries