Manage IntervalDtype

Author: droussea2001

pandas/core/algorithms.py

@@ -62,6 +62,7 @@
     BaseMaskedDtype,
     CategoricalDtype,
     ExtensionDtype,
+    IntervalDtype,
     NumpyEADtype,
 )
 from pandas.core.dtypes.generic import (
@@ -1665,7 +1666,11 @@ def map_array(
             from pandas import Series
 
             if len(mapper) == 0:
-                if is_extension_array_dtype(arr.dtype) and arr.dtype.na_value is NA:
+                if (
+                    is_extension_array_dtype(arr.dtype)
+                    and not isinstance(arr.dtype, IntervalDtype)
+                    and arr.dtype.na_value is NA
+                ):
                     mapper = Series(mapper, dtype=arr.dtype)
                 else:
                     mapper = Series(mapper, dtype=np.float64)

pandas/core/arrays/base.py

@@ -48,7 +48,6 @@
 )
 from pandas.core.dtypes.dtypes import (
     ExtensionDtype,
-    IntervalDtype,
     NumpyEADtype,
 )
 from pandas.core.dtypes.generic import (
@@ -2342,12 +2341,13 @@ def map(self, mapper, na_action: Literal["ignore"] | None = None):
             a MultiIndex will be returned.
         """
         result = map_array(self, mapper, na_action=na_action)
-        if isinstance(self.dtype, NumpyEADtype):
-            return pd_array(result, dtype=NumpyEADtype(result.dtype))
-        if isinstance(self.dtype, IntervalDtype):
-            return result
+        if isinstance(result, ExtensionArray):
+            if isinstance(self.dtype, NumpyEADtype):
+                return pd_array(result, dtype=NumpyEADtype(result.dtype))
+            else:
+                return result
         elif isinstance(result, np.ndarray):
-            return pd_array(result)
+            return pd_array(result, result.dtype)
         else:
             return result
 

pandas/tests/series/methods/test_map.py

@@ -9,6 +9,7 @@
 import pytest
 
 from pandas.core.dtypes.common import is_extension_array_dtype
+from pandas.core.dtypes.dtypes import IntervalDtype
 
 import pandas as pd
 from pandas import (
@@ -237,8 +238,11 @@ def test_map_empty(request, index):
 
     s = Series(index)
     result = s.map({})
-
-    if is_extension_array_dtype(s.dtype) and s.dtype.na_value is pd.NA:
+    if (
+        is_extension_array_dtype(s.dtype)
+        and not isinstance(s.dtype, IntervalDtype)
+        and s.dtype.na_value is pd.NA
+    ):
         na_value = s.dtype.na_value
         dtype = s.dtype
     else: