Updated fix logic

Author: arthurlw

pandas/core/arrays/base.py

@@ -757,26 +757,13 @@ def astype(self, dtype: AstypeArg, copy: bool = True) -> ArrayLike:
         >>> arr2.dtype
         dtype('float64')
         """
-        from pandas.api.types import (
-            CategoricalDtype,
-            is_datetime64_any_dtype,
-        )
-        from pandas.core.arrays import Categorical
-
         dtype = pandas_dtype(dtype)
         if dtype == self.dtype:
             if not copy:
                 return self
             else:
                 return self.copy()
 
-        if (
-            isinstance(self, Categorical)
-            and isinstance(dtype, CategoricalDtype)
-            and is_datetime64_any_dtype(self.categories)
-        ):
-            return Categorical(self.to_numpy(), dtype=dtype)
-
         if isinstance(dtype, ExtensionDtype):
             cls = dtype.construct_array_type()
             return cls._from_sequence(self, dtype=dtype, copy=copy)

pandas/core/arrays/categorical.py

@@ -73,6 +73,7 @@
     NDArrayBackedExtensionArray,
     ravel_compat,
 )
+from pandas.core.arrays.arrow.array import ArrowExtensionArray
 from pandas.core.base import (
     ExtensionArray,
     NoNewAttributesMixin,
@@ -483,6 +484,18 @@ def __init__(
             )
 
         else:
+            if isinstance(values, ArrowExtensionArray):
+                from pandas.api.types import (
+                    is_datetime64_any_dtype,
+                    is_timedelta64_dtype,
+                )
+
+                cat_dtype = dtype.categories.dtype
+                if is_datetime64_any_dtype(cat_dtype) or is_timedelta64_dtype(
+                    cat_dtype
+                ):
+                    values = values.to_numpy()
+
             codes = _get_codes_for_values(values, dtype.categories)
 
         if null_mask.any():