additional fixes plus tests

Author: Gnot727

pandas/core/algorithms.py

@@ -1651,12 +1651,7 @@ def map_array(
     if na_action not in (None, "ignore"):
         msg = f"na_acti(on must either be 'ignore' or None, {na_action} was passed"
         raise ValueError(msg)
-
-    check = pd.isna(arr)
 
-    def apply_map(x):
-        if na_action == "ignore" and pd.isna(x):
-            return x
 
     # we can fastpath dict/Series to an efficient map
     # as we know that we are not going to have to yield
@@ -1701,8 +1696,18 @@ def apply_map(x):
         return arr.copy()
 
     # we must convert to python types
-    values = arr.astype(object, copy=False)
-    if na_action is None:
-        return lib.map_infer(values, mapper)
-    else:
-        return lib.map_infer_mask(values, mapper, mask=isna(values).view(np.uint8))
+    #values = arr.astype(object, copy=False)
+
+    if is_integer_dtype(arr) and is_nullable_dtype(arr.dtype):
+        def mapper_check(x):
+            if x is None:
+                return pd.NA
+            else:
+                mapper(x)
+        values = arr.copy()
+
+        if na_action is None:
+            #return lib.map_infer(values, mapper)
+            return np.array([mapper_check(x) for x in values], dtype = arr.dtype)
+        else:
+            return lib.map_infer_mask(values, mapper, mask=isna(values).view(np.uint8))

pandas/core/apply.py

@@ -1457,14 +1457,18 @@ def apply_standard(self) -> DataFrame | Series:
                 return func(obj, *self.args, **self.kwargs)
         elif not self.by_row:
             return func(obj, *self.args, **self.kwargs)
-
-        if self.args or self.kwargs:
-            # _map_values does not support args/kwargs
-            def curried(x):
-                return func(x, *self.args, **self.kwargs)
+        
+        #Check if type is integer and nullable, return pd.NA for None values and
+        #normal func for other values
+        if pd.api.types.is_integer_dtype(obj) and pd.api.types.is_nullable_dtype(obj.dtype):
+            def wrapped_func(x):
+                if x is None:
+                    return pd.NA
+                return func(x,*self.args, **self.kwargs)
 
         else:
             curried = func
+
         mapped = obj._map_values(mapper=curried)
 
         if len(mapped) and isinstance(mapped[0], ABCSeries):

pandas/tests/apply/test_series_apply.py

@@ -665,3 +665,4 @@ def test_series_apply_unpack_nested_data():
     result = ser.apply(lambda x: Series(x))
     expected = DataFrame({0: [1.0, 4.0], 1: [2.0, 5.0], 2: [3.0, 6.0], 3: [np.nan, 7]})
     tm.assert_frame_equal(result, expected)
+