[Scipy-svn] r3035 - in trunk/Lib/sandbox/timeseries: . plotlib tests

[scipy-svn at scipy.org]

Author: pierregm
Date: 2007-05-23 09:38:21 -0500 (Wed, 23 May 2007)
New Revision: 3035

Modified:
   trunk/Lib/sandbox/timeseries/plotlib/mpl_timeseries.py
   trunk/Lib/sandbox/timeseries/tdates.py
   trunk/Lib/sandbox/timeseries/tests/test_timeseries.py
   trunk/Lib/sandbox/timeseries/tseries.py
Log:
plotlib.mpl_timeseries : copy the _series attribute from a figure to a subplot at the creation
tdates                 : fixed a pb w/ _cache
tseries                : updated __all__

Modified: trunk/Lib/sandbox/timeseries/plotlib/mpl_timeseries.py
===================================================================
--- trunk/Lib/sandbox/timeseries/plotlib/mpl_timeseries.py	2007-05-23 14:11:48 UTC (rev 3034)
+++ trunk/Lib/sandbox/timeseries/plotlib/mpl_timeseries.py	2007-05-23 14:38:21 UTC (rev 3035)
@@ -857,7 +857,12 @@
 def add_tsplot(axes, *args, **kwargs):
     kwargs.update(SubplotClass=TimeSeriesPlot)
     if 'series' not in kwargs.keys():
-        kwargs['series'] = None
+        if hasattr(axes, 'series'):
+            kwargs['series'] = axes.series
+        elif hasattr(axes, '_series'):
+            kwargs['series'] = axes._series
+        else:
+            kwargs['series'] = None
     return add_generic_subplot(axes, *args, **kwargs)
 Figure.add_tsplot = add_tsplot
 

Modified: trunk/Lib/sandbox/timeseries/tdates.py
===================================================================
--- trunk/Lib/sandbox/timeseries/tdates.py	2007-05-23 14:11:48 UTC (rev 3034)
+++ trunk/Lib/sandbox/timeseries/tdates.py	2007-05-23 14:38:21 UTC (rev 3035)
@@ -238,10 +238,9 @@
                                     for k in ('toobj', 'tostr', 'toord')
                                     if _cache[k] is not None]))
                 _cache['steps'] = None
-            if reset_full:
-                _cache['full'] = None
-                _cache['hasdups'] = None
-                
+                if reset_full:
+                    _cache['full'] = None
+                    _cache['hasdups'] = None
             return r
 
     def __getslice__(self, i, j):

Modified: trunk/Lib/sandbox/timeseries/tests/test_timeseries.py
===================================================================
--- trunk/Lib/sandbox/timeseries/tests/test_timeseries.py	2007-05-23 14:11:48 UTC (rev 3034)
+++ trunk/Lib/sandbox/timeseries/tests/test_timeseries.py	2007-05-23 14:38:21 UTC (rev 3035)
@@ -28,8 +28,8 @@
 from timeseries import tseries
 from timeseries import Date, date_array_fromlist, date_array, thisday
 from timeseries import time_series, TimeSeries, adjust_endpoints, \
-    mask_period, align_series, fill_missing_dates, tsmasked, concatenate_series,\
-    stack, split
+    mask_period, align_series, align_with, fill_missing_dates, tsmasked, \
+    concatenate_series, stack, split
 
 class test_creation(NumpyTestCase):
     "Base test class for MaskedArrays."

Modified: trunk/Lib/sandbox/timeseries/tseries.py
===================================================================
--- trunk/Lib/sandbox/timeseries/tseries.py	2007-05-23 14:11:48 UTC (rev 3034)
+++ trunk/Lib/sandbox/timeseries/tseries.py	2007-05-23 14:38:21 UTC (rev 3035)
@@ -48,7 +48,7 @@
 'TimeSeriesError','TimeSeriesCompatibilityError','TimeSeries','isTimeSeries',
 'time_series', 'tsmasked',
 'mask_period','mask_inside_period','mask_outside_period','compressed',
-'adjust_endpoints','align_series','aligned','convert','group_byperiod',
+'adjust_endpoints','align_series','align_with','aligned','convert','group_byperiod',
 'pct','tshift','fill_missing_dates', 'split', 'stack', 'concatenate_series',
 'empty_like',
 'day_of_week','day_of_year','day','month','quarter','year',