Skip to content

Commit fb7f211

Browse files
author
hugo
committed
fix for pandas-dev#16889 along with test
1 parent 9d13227 commit fb7f211

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

pandas/core/indexing.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -760,10 +760,12 @@ def _align_frame(self, indexer, df):
760760
for i, ix in enumerate(indexer):
761761
ax = self.obj.axes[i]
762762
if is_sequence(ix) or isinstance(ix, slice):
763+
if isinstance(ix, np.ndarray):
764+
ix = ix.ravel()
763765
if idx is None:
764-
idx = ax[ix].ravel()
766+
idx = ax[ix]
765767
elif cols is None:
766-
cols = ax[ix].ravel()
768+
cols = ax[ix]
767769
else:
768770
break
769771
else:

pandas/tests/indexing/test_datetime.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@
77

88

99
class TestDatetimeIndex(object):
10-
10+
def test_setitem_with_datetime_tz(self):
11+
mask = np.array([True, False, True, False])
12+
idx = pd.date_range('20010101', periods=4, tz='UTC')
13+
df = pd.DataFrame({'a' : np.arange(4)}, index=idx).astype('float64')
14+
test = df.copy()
15+
test.loc[mask, :] = df.loc[mask, :]
16+
tm.assert_frame_equal(test, df)
17+
1118
def test_indexing_with_datetime_tz(self):
1219

1320
# 8260

0 commit comments

Comments
 (0)