fixup test

pandas-dev · mroeschke · Aug 26, 2021 · Jul 27, 2020 · Jul 27, 2020 · Jul 27, 2020
commit 5362670f6a3243d16584cc7c687779ecec500729
diff --git a/pandas/_libs/tslibs/parsing.pyx b/pandas/_libs/tslibs/parsing.pyx
@@ -39,7 +39,7 @@ cnp.import_array()
 
 from dateutil.parser import (
     DEFAULTPARSER,
-    parse as du_parse_raw,
+    parse as du_parse,
 )
 from dateutil.relativedelta import relativedelta
 from dateutil.tz import (
@@ -238,12 +238,12 @@ cdef inline bint does_string_look_like_time(str parse_string):
     return 0 <= hour <= 23 and 0 <= minute <= 59
 
 
-def du_parse(*args, **kwargs):
+def du_parse_with_warning(*args, **kwargs):
     warnings.warn(
         "Parsing datetime strings without a format specified, "
         "please specify a format to avoid unexpected results"
     )
-    return du_parse_raw(*args, **kwargs)
+    return du_parse(*args, **kwargs)
 
 
 def parse_datetime_string(
@@ -269,8 +269,12 @@ def parse_datetime_string(
 
     if does_string_look_like_time(date_string):
         # use current datetime as default, not pass _DEFAULT_DATETIME
-        dt = du_parse(date_string, dayfirst=dayfirst,
-                      yearfirst=yearfirst, **kwargs)
+        dt = du_parse_with_warning(
+            date_string,
+            dayfirst=dayfirst,
+            yearfirst=yearfirst,
+            **kwargs,
+        )
         return dt
 
     dt, _ = _parse_delimited_date(date_string, dayfirst)
@@ -286,8 +290,13 @@ def parse_datetime_string(
         pass
 
     try:
-        dt = du_parse(date_string, default=_DEFAULT_DATETIME,
-                      dayfirst=dayfirst, yearfirst=yearfirst, **kwargs)
+        dt = du_parse_with_warning(
+            date_string,
+            default=_DEFAULT_DATETIME,
+            dayfirst=dayfirst,
+            yearfirst=yearfirst,
+            **kwargs,
+        )
     except TypeError:
         # following may be raised from dateutil
         # TypeError: 'NoneType' object is not iterable
@@ -641,7 +650,11 @@ def try_parse_dates(
             date = datetime.now()
             default = datetime(date.year, date.month, 1)
 
-        parse_date = lambda x: du_parse(x, dayfirst=dayfirst, default=default)
+        parse_date = lambda x: du_parse_with_warning(
+            x,
+            dayfirst=dayfirst,
+            default=default,
+        )
 
         # EAFP here
         try:
@@ -688,13 +701,17 @@ def try_parse_date_and_time(
             date = datetime.now()
             default = datetime(date.year, date.month, 1)
 
-        parse_date = lambda x: du_parse(x, dayfirst=dayfirst, default=default)
+        parse_date = lambda x: du_parse_with_warning(
+            x,
+            dayfirst=dayfirst,
+            default=default,
+        )
 
     else:
         parse_date = date_parser
 
     if time_parser is None:
-        parse_time = lambda x: du_parse(x)
+        parse_time = lambda x: du_parse_with_warning(x)
 
     else:
         parse_time = time_parser
@@ -868,7 +885,7 @@ def format_is_iso(f: str) -> bint:
 def guess_datetime_format(
     dt_str,
     bint dayfirst=False,
-    dt_str_parse=du_parse,
+    dt_str_parse=du_parse_with_warning,
     dt_str_split=_DATEUTIL_LEXER_SPLIT,
 ):
     """

diff --git a/pandas/tests/frame/methods/test_reset_index.py b/pandas/tests/frame/methods/test_reset_index.py
@@ -54,7 +54,7 @@ def test_reset_index_tz(self, tz_aware_fixture):
         # GH 3950
         # reset_index with single level
         tz = tz_aware_fixture
-        idx = date_range("1/1/2011", periods=5, freq="D", tz=tz, name="idx")
+        idx = date_range("01/01/2011", periods=5, freq="D", tz=tz, name="idx")
         df = DataFrame({"a": range(5), "b": ["A", "B", "C", "D", "E"]}, index=idx)
 
         expected = DataFrame(
@@ -320,28 +320,82 @@ def test_reset_index_multiindex_nan(self):
         [
             None,
             "foo",
+        ],
+    )
+    def test_reset_index_with_datetimeindex_cols_with_user_warning(self, name):
+        # GH#5818
+        df = DataFrame(
+            [[1, 2], [3, 4]],
+            columns=date_range("01/01/2013", "01/02/2013"),
+            index=["A", "B"],
+        )
+        df.index.name = name
+
+        with tm.assert_produces_warning(UserWarning):
+            result = df.reset_index()
+
+        item = name if name is not None else "index"
+        columns = Index([item, datetime(2013, 1, 1), datetime(2013, 1, 2)])
+        if isinstance(item, str) and item == "2012-12-31":
+            columns = columns.astype("datetime64[ns]")
+        else:
+            assert columns.dtype == object
+
+        expected = DataFrame(
+            [["A", 1, 2], ["B", 3, 4]],
+            columns=columns,
+        )
+        tm.assert_frame_equal(result, expected)
+
+    @pytest.mark.parametrize(
+        "name",
+        [
             2,
             3.0,
             pd.Timedelta(6),
-            Timestamp("2012-12-30", tz="UTC"),
             "2012-12-31",
         ],
     )
     def test_reset_index_with_datetimeindex_cols(self, name):
         # GH#5818
-        warn = None
-        if isinstance(name, Timestamp) and name.tz is not None:
-            # _deprecate_mismatched_indexing
-            warn = FutureWarning
+        df = DataFrame(
+            [[1, 2], [3, 4]],
+            columns=date_range("01/01/2013", "01/02/2013"),
+            index=["A", "B"],
+        )
+        df.index.name = name
+
+        result = df.reset_index()
+
+        item = name if name is not None else "index"
+        columns = Index([item, datetime(2013, 1, 1), datetime(2013, 1, 2)])
+        if isinstance(item, str) and item == "2012-12-31":
+            columns = columns.astype("datetime64[ns]")
+        else:
+            assert columns.dtype == object
 
+        expected = DataFrame(
+            [["A", 1, 2], ["B", 3, 4]],
+            columns=columns,
+        )
+        tm.assert_frame_equal(result, expected)
+
+    @pytest.mark.parametrize(
+        "name",
+        [
+            Timestamp("2012-12-30", tz="UTC"),
+        ],
+    )
+    def test_reset_index_with_datetimeindex_cols_with_future_warning(self, name):
+        # GH#5818
         df = DataFrame(
             [[1, 2], [3, 4]],
-            columns=date_range("1/1/2013", "1/2/2013"),
+            columns=date_range("01/01/2013", "01/02/2013"),
             index=["A", "B"],
         )
         df.index.name = name
 
-        with tm.assert_produces_warning(warn):
+        with tm.assert_produces_warning((FutureWarning, UserWarning)):
             result = df.reset_index()
 
         item = name if name is not None else "index"
@@ -425,7 +479,7 @@ def test_reset_index_multiindex_columns(self):
     def test_reset_index_datetime(self, tz_naive_fixture):
         # GH#3950
         tz = tz_naive_fixture
-        idx1 = date_range("1/1/2011", periods=5, freq="D", tz=tz, name="idx1")
+        idx1 = date_range("01/01/2011", periods=5, freq="D", tz=tz, name="idx1")
         idx2 = Index(range(5), name="idx2", dtype="int64")
         idx = MultiIndex.from_arrays([idx1, idx2])
         df = DataFrame(
@@ -453,7 +507,7 @@ def test_reset_index_datetime(self, tz_naive_fixture):
         tm.assert_frame_equal(df.reset_index(), expected)
 
         idx3 = date_range(
-            "1/1/2012", periods=5, freq="MS", tz="Europe/Paris", name="idx3"
+            "01/01/2012", periods=5, freq="MS", tz="Europe/Paris", name="idx3"
         )
         idx = MultiIndex.from_arrays([idx1, idx2, idx3])
         df = DataFrame(
@@ -615,7 +669,7 @@ def test_rest_index_multiindex_categorical_with_missing_values(self, codes):
     [
         (["a", "b"], object),
         (
-            pd.period_range("12-1-2000", periods=2, freq="Q-DEC"),
+            pd.period_range("12-01-2000", periods=2, freq="Q-DEC"),
             pd.PeriodDtype(freq="Q-DEC"),
         ),
     ],