10
10
11
11
from pandas .core .datetools import (
12
12
bday , BDay , cday , CDay , BQuarterEnd , BMonthEnd ,
13
- CBMonthEnd , CBMonthBegin ,
13
+ CBMonthEnd , CBMonthBegin ,
14
14
BYearEnd , MonthEnd , MonthBegin , BYearBegin ,
15
15
QuarterBegin , BQuarterBegin , BMonthBegin , DateOffset , Week ,
16
16
YearBegin , YearEnd , Hour , Minute , Second , Day , Micro , Milli , Nano , Easter ,
@@ -601,7 +601,7 @@ class TestCustomBusinessMonthEnd(TestBase):
601
601
def setUp (self ):
602
602
self .d = datetime (2008 , 1 , 1 )
603
603
604
- _skip_if_no_cday ()
604
+ _skip_if_no_cday ()
605
605
self .offset = CBMonthEnd ()
606
606
self .offset2 = CBMonthEnd (2 )
607
607
@@ -636,14 +636,14 @@ def testSub(self):
636
636
self .assertRaises (Exception , off .__sub__ , self .d )
637
637
self .assertEqual (2 * off - off , off )
638
638
639
- self .assertEqual (self .d - self .offset2 ,
639
+ self .assertEqual (self .d - self .offset2 ,
640
640
self .d + CBMonthEnd (- 2 ))
641
641
642
642
def testRSub (self ):
643
643
self .assertEqual (self .d - self .offset2 , (- self .offset2 ).apply (self .d ))
644
644
645
645
def testMult1 (self ):
646
- self .assertEqual (self .d + 10 * self .offset ,
646
+ self .assertEqual (self .d + 10 * self .offset ,
647
647
self .d + CBMonthEnd (10 ))
648
648
649
649
def testMult2 (self ):
@@ -748,10 +748,8 @@ def test_holidays(self):
748
748
self .assertEqual (dt + bm_offset ,datetime (2012 ,1 ,30 ))
749
749
self .assertEqual (dt + 2 * bm_offset ,datetime (2012 ,2 ,27 ))
750
750
751
- def test_datetimindex (self ):
751
+ def test_datetimeindex (self ):
752
752
from pandas .tseries .holiday import USFederalHolidayCalendar
753
- self .assertEqual (DatetimeIndex (start = '2012' ,end = '2013' ,freq = 'CBM' ).tolist ()[0 ],
754
- datetime (2012 ,4 ,30 ))
755
753
self .assertEqual (DatetimeIndex (start = '20120101' ,end = '20130101' ,freq = CBMonthEnd (calendar = USFederalHolidayCalendar ())).tolist ()[0 ],
756
754
datetime (2012 ,1 ,31 ))
757
755
@@ -762,7 +760,7 @@ class TestCustomBusinessMonthBegin(TestBase):
762
760
def setUp (self ):
763
761
self .d = datetime (2008 , 1 , 1 )
764
762
765
- _skip_if_no_cday ()
763
+ _skip_if_no_cday ()
766
764
self .offset = CBMonthBegin ()
767
765
self .offset2 = CBMonthBegin (2 )
768
766
@@ -797,14 +795,14 @@ def testSub(self):
797
795
self .assertRaises (Exception , off .__sub__ , self .d )
798
796
self .assertEqual (2 * off - off , off )
799
797
800
- self .assertEqual (self .d - self .offset2 ,
798
+ self .assertEqual (self .d - self .offset2 ,
801
799
self .d + CBMonthBegin (- 2 ))
802
800
803
801
def testRSub (self ):
804
802
self .assertEqual (self .d - self .offset2 , (- self .offset2 ).apply (self .d ))
805
803
806
804
def testMult1 (self ):
807
- self .assertEqual (self .d + 10 * self .offset ,
805
+ self .assertEqual (self .d + 10 * self .offset ,
808
806
self .d + CBMonthBegin (10 ))
809
807
810
808
def testMult2 (self ):
@@ -2871,3 +2869,4 @@ def test_str_for_named_is_name(self):
2871
2869
if __name__ == '__main__' :
2872
2870
nose .runmodule (argv = [__file__ , '-vvs' , '-x' , '--pdb' , '--pdb-failure' ],
2873
2871
exit = False )
2872
+