[Scipy-svn] r2463 - trunk/Lib/sandbox/timeseries

[scipy-svn at scipy.org]

Author: mattknox_ca
Date: 2006-12-22 08:39:32 -0600 (Fri, 22 Dec 2006)
New Revision: 2463

Modified:
   trunk/Lib/sandbox/timeseries/tsdate.py
Log:


Modified: trunk/Lib/sandbox/timeseries/tsdate.py
===================================================================
--- trunk/Lib/sandbox/timeseries/tsdate.py	2006-12-22 10:04:50 UTC (rev 2462)
+++ trunk/Lib/sandbox/timeseries/tsdate.py	2006-12-22 14:39:32 UTC (rev 2463)
@@ -77,19 +77,21 @@
         return tmpStr.replace("XXXX", str(self.quarter()))
             
     def __str__(self):
+        return self.strfmt(self.default_fmtstr())
+    
+    def default_fmtstr(self):
         if self.freq in ("B", "D"):
-            return self.strfmt("%d-%b-%y")
+            return "%d-%b-%y"
         elif self.freq == "S":
-            return self.strfmt("%d-%b-%Y %H:%M:%S")
+            return "%d-%b-%Y %H:%M:%S"
         elif self.freq == "M":
-            return self.strfmt("%b-%Y")
+            return "%b-%Y"
         elif self.freq == "Q":
-            return self.strfmt("%Yq%q")
+            return "%Yq%q"
         elif self.freq == "A":
-            return self.strfmt("%Y")
+            return "%Y"
         else:
-            return self.strfmt("%d-%b-%y")
-
+            return "%d-%b-%y"
         
     def __add__(self, other):
         if isinstance(other, Date):