@@ -485,7 +485,7 @@ def test_range_closed(self):
485
485
begin = datetime (2011 , 1 , 1 )
486
486
end = datetime (2014 , 1 , 1 )
487
487
488
- for freq in ["3D" , "2M" , "7W" , "3H" , "A" ]:
488
+ for freq in ["1D" , " 3D" , "2M" , "7W" , "3H" , "A" ]:
489
489
closed = date_range (begin , end , closed = None , freq = freq )
490
490
left = date_range (begin , end , closed = "left" , freq = freq )
491
491
right = date_range (begin , end , closed = "right" , freq = freq )
@@ -501,11 +501,11 @@ def test_range_closed(self):
501
501
self .assert_index_equal (expected_right , right )
502
502
503
503
def test_range_closed_with_tz_aware_start_end (self ):
504
- # GH12409
504
+ # GH12409, GH12684
505
505
begin = Timestamp ('2011/1/1' , tz = 'US/Eastern' )
506
506
end = Timestamp ('2014/1/1' , tz = 'US/Eastern' )
507
507
508
- for freq in ["3D" , "2M" , "7W" , "3H" , "A" ]:
508
+ for freq in ["1D" , " 3D" , "2M" , "7W" , "3H" , "A" ]:
509
509
closed = date_range (begin , end , closed = None , freq = freq )
510
510
left = date_range (begin , end , closed = "left" , freq = freq )
511
511
right = date_range (begin , end , closed = "right" , freq = freq )
@@ -520,15 +520,28 @@ def test_range_closed_with_tz_aware_start_end(self):
520
520
self .assert_index_equal (expected_left , left )
521
521
self .assert_index_equal (expected_right , right )
522
522
523
- # test with default frequency, UTC
524
- begin = Timestamp ('2011/1/1' , tz = 'UTC' )
525
- end = Timestamp ('2014/1/1' , tz = 'UTC' )
523
+ begin = Timestamp ('2011/1/1' )
524
+ end = Timestamp ('2014/1/1' )
525
+ begintz = Timestamp ('2011/1/1' , tz = 'US/Eastern' )
526
+ endtz = Timestamp ('2014/1/1' , tz = 'US/Eastern' )
527
+
528
+ for freq in ["1D" , "3D" , "2M" , "7W" , "3H" , "A" ]:
529
+ closed = date_range (begin , end , closed = None , freq = freq ,
530
+ tz = 'US/Eastern' )
531
+ left = date_range (begin , end , closed = "left" , freq = freq ,
532
+ tz = 'US/Eastern' )
533
+ right = date_range (begin , end , closed = "right" , freq = freq ,
534
+ tz = 'US/Eastern' )
535
+ expected_left = left
536
+ expected_right = right
526
537
527
- intervals = ['left' , 'right' , None ]
528
- for i in intervals :
529
- result = date_range (start = begin , end = end , closed = i )
530
- self .assertEqual (result [0 ], begin )
531
- self .assertEqual (result [- 1 ], end )
538
+ if endtz == closed [- 1 ]:
539
+ expected_left = closed [:- 1 ]
540
+ if begintz == closed [0 ]:
541
+ expected_right = closed [1 :]
542
+
543
+ self .assert_index_equal (expected_left , left )
544
+ self .assert_index_equal (expected_right , right )
532
545
533
546
def test_range_closed_boundary (self ):
534
547
# GH 11804
0 commit comments