File tree 3 files changed +13
-2
lines changed
3 files changed +13
-2
lines changed Original file line number Diff line number Diff line change @@ -65,6 +65,7 @@ pandas 0.8.1
65
65
- Work around numpy.concatenate use/bug in Series.set_value (#1561)
66
66
- Ensure Series/DataFrame are sorted before resampling (#1580)
67
67
- Fix unhandled IndexError when indexing very large time series (#1562)
68
+ - Fix DatetimeIndex intersection logic error with irregular indexes (#1551)
68
69
69
70
pandas 0.8.0
70
71
============
Original file line number Diff line number Diff line change @@ -815,8 +815,9 @@ def intersection(self, other):
815
815
result .offset = to_offset (result .inferred_freq )
816
816
return result
817
817
818
- elif other .offset != self .offset or (not self .is_monotonic or
819
- not other .is_monotonic ):
818
+ elif (other .offset is None or self .offset is None or
819
+ other .offset != self .offset or
820
+ (not self .is_monotonic or not other .is_monotonic )):
820
821
result = Index .intersection (self , other )
821
822
if isinstance (result , DatetimeIndex ):
822
823
if result .freq is None :
Original file line number Diff line number Diff line change @@ -1802,6 +1802,15 @@ def test_union(self):
1802
1802
df = DataFrame ({'s1' : s1 , 's2' : s2 })
1803
1803
self .assert_ (df .index .values .dtype == np .dtype ('M8[ns]' ))
1804
1804
1805
+ def test_intersection (self ):
1806
+ rng = date_range ('6/1/2000' , '6/15/2000' , freq = 'D' )
1807
+ rng = rng .delete (5 )
1808
+
1809
+ rng2 = date_range ('5/15/2000' , '6/20/2000' , freq = 'D' )
1810
+ rng2 = DatetimeIndex (rng2 .values )
1811
+
1812
+ result = rng .intersection (rng2 )
1813
+ self .assert_ (result .equals (rng ))
1805
1814
1806
1815
class TestTimestamp (unittest .TestCase ):
1807
1816
You can’t perform that action at this time.
0 commit comments