From cfa9af80150fc59a88188ff5370971c9a1e9e38b Mon Sep 17 00:00:00 2001
From: aditzkabitz <adgupta@umich.edu>
Date: Mon, 13 Dec 2021 21:10:29 +0000
Subject: [PATCH] BUG fixed fillna('') on a Int64 column causes TypeError: <U3
 cannot be converted to an IntegerDtype(#44289)

---
 pandas/core/frame.py                      |  6 ++
 pandas/tests/frame/methods/test_fillna.py | 84 +++++++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/pandas/core/frame.py b/pandas/core/frame.py
index fa5e9dc51419a..658d28421cd79 100644
--- a/pandas/core/frame.py
+++ b/pandas/core/frame.py
@@ -598,6 +598,12 @@ def __init__(
         if data is None:
             data = {}
         if dtype is not None:
+            if isinstance(dtype, str):
+                if dtype == "Int64":
+                    dtype = "int64"
+                elif dtype == "Float64":
+                    dtype = "float64"
+
             dtype = self._validate_dtype(dtype)
 
         if isinstance(data, DataFrame):
diff --git a/pandas/tests/frame/methods/test_fillna.py b/pandas/tests/frame/methods/test_fillna.py
index b5bdf6a70199c..99d2201605445 100644
--- a/pandas/tests/frame/methods/test_fillna.py
+++ b/pandas/tests/frame/methods/test_fillna.py
@@ -647,3 +647,87 @@ def test_fillna_nonconsolidated_frame():
     df_nonconsol = df.pivot("i1", "i2")
     result = df_nonconsol.fillna(0)
     assert result.isna().sum().sum() == 0
+
+
+def test_fillna_with_int_and_string_nonempty():
+    df = DataFrame(
+        {
+            "A": [1, 2, np.nan],
+            "B": [4, np.nan, 8],
+        },
+        dtype="Int64",
+    )
+    df.fillna("nan")
+
+    expected = df = DataFrame(
+        {
+            "A": [1, 2, " "],
+            "B": [4, " ", 8],
+        },
+        dtype="Int64",
+    )
+
+    tm.assert_frame_equal(df, expected)
+
+
+def test_fillna_with_int_and_string_empty():
+    df = DataFrame(
+        {
+            "A": [1, 2, np.nan],
+            "B": [4, np.nan, 8],
+        },
+        dtype="Int64",
+    )
+    df.fillna(" ")
+
+    expected = df = DataFrame(
+        {
+            "A": [1, 2, " "],
+            "B": [4, " ", 8],
+        },
+        dtype="Int64",
+    )
+
+    tm.assert_frame_equal(df, expected)
+
+
+def test_fillna_with_float_and_string_nonempty():
+    df = DataFrame(
+        {
+            "A": [1, 2, np.nan],
+            "B": [4, np.nan, 8],
+        },
+        dtype="Float64",
+    )
+    df.fillna("nan")
+
+    expected = df = DataFrame(
+        {
+            "A": [1, 2, " "],
+            "B": [4, " ", 8],
+        },
+        dtype="Float64",
+    )
+
+    tm.assert_frame_equal(df, expected)
+
+
+def test_fillna_with_float_and_string_empty():
+    df = DataFrame(
+        {
+            "A": [1, 2, np.nan],
+            "B": [4, np.nan, 8],
+        },
+        dtype="Float64",
+    )
+    df.fillna(" ")
+
+    expected = df = DataFrame(
+        {
+            "A": [1, 2, " "],
+            "B": [4, " ", 8],
+        },
+        dtype="Float64",
+    )
+
+    tm.assert_frame_equal(df, expected)