Skip to content

Commit e472dad

Browse files
Chang Shewesm
Chang She
authored andcommitted
TST: more tests for 0.8
1 parent d671492 commit e472dad

File tree

4 files changed

+22
-6
lines changed

4 files changed

+22
-6
lines changed

pandas/core/common.py

+15
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,21 @@ def _unpickle_array(bytes):
140140
arr = read_array(BytesIO(bytes))
141141
return arr
142142

143+
def _take_1d_datetime(arr, indexer, out, fill_value=np.nan):
144+
view = arr.view(np.int64)
145+
outview = out.view(np.int64)
146+
_algos.take_1d_bool(view, indexer, outview, fill_value=fill_value)
147+
148+
def _take_2d_axis0_datetime(arr, indexer, out, fill_value=np.nan):
149+
view = arr.view(np.int64)
150+
outview = out.view(np.int64)
151+
_algos.take_1d_bool(view, indexer, outview, fill_value=fill_value)
152+
153+
def _take_2d_axis1_datetime(arr, indexer, out, fill_value=np.nan):
154+
view = arr.view(np.uint8)
155+
outview = out.view(np.uint8)
156+
_algos.take_1d_bool(view, indexer, outview, fill_value=fill_value)
157+
143158
def _view_wrapper(f, wrap_dtype, na_override=None):
144159
def wrapper(arr, indexer, out, fill_value=np.nan):
145160
if na_override is not None and np.isnan(fill_value):

pandas/core/series.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,6 @@ def __setitem__(self, key, value):
512512
if 'unorderable' in str(e): # pragma: no cover
513513
raise IndexError(key)
514514
# Could not hash item
515-
pass
516515

517516
if _is_bool_indexer(key):
518517
key = self._check_bool_indexer(key)
@@ -2645,6 +2644,7 @@ def _try_cast(arr):
26452644
except Exception:
26462645
if raise_cast_failure:
26472646
raise
2647+
subarr = np.array(data, dtype=object, copy=copy)
26482648
subarr = lib.maybe_convert_objects(subarr)
26492649
else:
26502650
subarr = lib.list_to_object_array(data)

pandas/tests/test_frame.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -5651,15 +5651,15 @@ def test_reindex_multi(self):
56515651

56525652
df = DataFrame(np.random.randint(0, 10, (3, 3)))
56535653

5654-
result = df.reindex(range(3), range(3))
5655-
expected = df.reindex(range(3)).reindex(columns=range(3))
5654+
result = df.reindex(range(2), range(2))
5655+
expected = df.reindex(range(2)).reindex(columns=range(2))
56565656

56575657
assert_frame_equal(result, expected)
56585658

56595659
df = df + 1j
56605660

5661-
result = df.reindex(range(4), range(4))
5662-
expected = df.reindex(range(4)).reindex(columns=range(4))
5661+
result = df.reindex(range(3), range(3))
5662+
expected = df.reindex(range(3)).reindex(columns=range(3))
56635663

56645664
assert_frame_equal(result, expected)
56655665

pandas/tests/test_series.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1255,8 +1255,9 @@ def check_comparators(series, other):
12551255

12561256
check_comparators(self.ts, 5)
12571257
check_comparators(self.ts, self.ts + 1)
1258+
12581259
bool_ser = self.ts > 0
1259-
check_comparators(bool_ser, bool_ser[::2])
1260+
check_comparators(bool_ser, list(bool_ser[::2]))
12601261

12611262

12621263
def test_operators_empty_int_corner(self):

0 commit comments

Comments
 (0)