TST: Fix not-boxed maybe_promote test (pandas-dev#28852)

proost · Dec 19, 2019 · 3a4733a · 3a4733a
1 parent 03f837a
commit 3a4733a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pandas/core/dtypes/cast.py b/pandas/core/dtypes/cast.py
@@ -359,6 +359,8 @@ def maybe_promote(dtype, fill_value=np.nan):
         if isinstance(fill_value, datetime) and fill_value.tzinfo is not None:
             # Trying to insert tzaware into tznaive, have to cast to object
             dtype = np.dtype(np.object_)
+        elif is_integer(fill_value) or (is_float(fill_value) and not isna(fill_value)):
+            dtype = np.dtype(np.object_)
         else:
             try:
                 fill_value = tslibs.Timestamp(fill_value).to_datetime64()

diff --git a/pandas/tests/dtypes/cast/test_promote.py b/pandas/tests/dtypes/cast/test_promote.py
@@ -592,8 +592,6 @@ def test_maybe_promote_datetime64_with_any(
     else:
         if boxed and box_dtype is None:
             pytest.xfail("does not upcast to object")
-        if not boxed:
-            pytest.xfail("does not upcast to object or raises")
 
     # create array of given dtype; casts "1" to correct dtype
     fill_value = np.array([1], dtype=fill_dtype)[0]