ENH: freqstr with offset #1184

Author: Chang She

pandas/tseries/offsets.py

@@ -221,10 +221,11 @@ def freqstr(self):
             return repr(self)
 
         if self.n != 1:
-            return '%d%s' % (self.n, code)
+            fstr = '%d%s' % (self.n, code)
         else:
-            return code
+            fstr = code
 
+        return fstr
 
 class BusinessDay(CacheableOffset, DateOffset):
     """
@@ -261,6 +262,55 @@ def __repr__(self):
         out += '>'
         return out
 
+    @property
+    def freqstr(self):
+        try:
+            code = self.rule_code
+        except NotImplementedError:
+            return repr(self)
+
+        if self.n != 1:
+            fstr = '%d%s' % (self.n, code)
+        else:
+            fstr = code
+
+        if self.offset:
+            fstr += self._offset_str()
+
+        return fstr
+
+    def _offset_str(self):
+
+        def get_str(td):
+            off_str = ''
+            if td.days > 0:
+                off_str += str(td.days) + 'D'
+            if td.seconds > 0:
+                s = td.seconds
+                hrs = int(s / 3600)
+                if hrs != 0:
+                    off_str += str(hrs) + 'H'
+                    s -= hrs * 3600
+                mts = int(s / 60)
+                if mts != 0:
+                    off_str += str(mts) + 'Min'
+                    s -= mts * 60
+                if s != 0:
+                    off_str += str(s) + 's'
+            if td.microseconds > 0:
+                off_str += str(td.microseconds) + 'us'
+            return off_str
+
+        if isinstance(self.offset, timedelta):
+            tot_sec = self.offset.total_seconds()
+            if tot_sec > 0:
+                off_str = '+' + get_str(self.offset)
+            if tot_sec < 0:
+                off_str = '-' + get_str(-self.offset)
+            return off_str
+        else:
+            return '+' + repr(self.offset)
+
     def isAnchored(self):
         return (self.n == 1)
 

pandas/tseries/tests/test_offsets.py

@@ -1389,6 +1389,13 @@ def test_dateoffset_misc():
 
     assert(not offsets.DateOffset(months=2) == 2)
 
+def test_freq_offsets():
+    off = BDay(1, offset=timedelta(0, 1800))
+    assert(off.freqstr == 'B+30Min')
+
+    off = BDay(1, offset=timedelta(0, -1800))
+    assert(off.freqstr == 'B-30Min')
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=[__file__,'-vvs','-x','--pdb', '--pdb-failure'],