|
9 | 9 | import pandas as pd
|
10 | 10 | from pandas import DataFrame, Series, Timestamp, date_range
|
11 | 11 | from pandas.api.types import is_scalar
|
12 |
| -from pandas.core.dtypes.cast import maybe_cast_to_datetime |
13 | 12 | from pandas.tests.indexing.common import Base
|
14 | 13 | from pandas.util import testing as tm
|
15 | 14 |
|
@@ -692,22 +691,30 @@ def test_loc_setitem_consistency_slice_column_len(self):
|
692 | 691 | tm.assert_series_equal(df[("Respondent", "Duration")], expected)
|
693 | 692 |
|
694 | 693 | @pytest.mark.parametrize(
|
695 |
| - "obj,dtype", |
| 694 | + "dtype", |
696 | 695 | [
|
697 |
| - (np.datetime64("2017-01-01 01:00:00"), "datetime64"), |
698 |
| - (np.datetime64("2017-01-01 02:00:00"), "datetime64[ns]"), |
699 |
| - (np.datetime64("2017-01-02 01:00:00"), "datetime64[Y]"), |
700 |
| - (np.datetime64("2017-01-03 02:00:00"), "datetime64[M]"), |
701 |
| - (np.datetime64("2017-01-04 02:00:00"), "datetime64[D]"), |
702 |
| - (np.datetime64("2017-01-05 02:00:00"), "datetime64[h]"), |
703 |
| - (np.datetime64("2017-01-06 02:10:00"), "datetime64[m]"), |
704 |
| - (np.datetime64("2017-01-07 02:20:10"), "datetime64[s]"), |
705 |
| - (np.datetime64("2017-01-08 02:40:20"), "datetime64[ms]"), |
706 |
| - (np.datetime64("2017-01-09 02:50:30"), "datetime64[ns]"), |
| 696 | + "datetime64", |
| 697 | + "datetime64[ns]", |
| 698 | + "datetime64[Y]", |
| 699 | + "datetime64[M]", |
| 700 | + "datetime64[D]", |
| 701 | + "datetime64[h]", |
| 702 | + "datetime64[m]", |
| 703 | + "datetime64[s]", |
| 704 | + "datetime64[ms]", |
| 705 | + "datetime64[ns]", |
707 | 706 | ],
|
708 | 707 | )
|
709 |
| - def test_maybe_cast_to_datetime(obj, dtype): |
710 |
| - maybe_cast_to_datetime(obj, dtype) |
| 708 | + def test_loc_assign_non_ns_datetime(self, dtype): |
| 709 | + df = pd.DataFrame( |
| 710 | + { |
| 711 | + "timestamp": [ |
| 712 | + np.datetime64("2017-01-01 01:11:20"), |
| 713 | + np.datetime64("2017-01-01 02:01:30"), |
| 714 | + ] |
| 715 | + } |
| 716 | + ) |
| 717 | + df.loc[:, "day"] = df.loc[:, "timestamp"].values.astype(dtype) |
711 | 718 |
|
712 | 719 | def test_loc_setitem_frame(self):
|
713 | 720 | df = self.frame_labels
|
|
0 commit comments