Simplify categorical make_accessor args

pandas/core/categorical.py

@@ -2055,11 +2055,11 @@ def _make_accessor(cls, values):
         if not is_categorical_dtype(values.dtype):
             msg = "Can only use .cat accessor with a 'category' dtype"
             raise AttributeError(msg)
-        return CategoricalAccessor(values.values, values.index)
+        return CategoricalAccessor(values)
 
-    def __init__(self, values, index):
-        self.categorical = values
-        self.index = index
+    def __init__(self, values):
+        self.categorical = values.values
+        self.index = values.index
         self._freeze()
 
     def _delegate_property_get(self, name):

pandas/core/indexes/category.py

@@ -123,8 +123,6 @@ def _create_from_codes(self, codes, categories=None, ordered=None,
         -------
         CategoricalIndex
         """
-
-        from pandas.core.categorical import Categorical
         if categories is None:
             categories = self.categories
         if ordered is None:
@@ -154,7 +152,6 @@ def _create_categorical(self, data, categories=None, ordered=None):
         """
         if not isinstance(data, ABCCategorical):
             ordered = False if ordered is None else ordered
-            from pandas.core.categorical import Categorical
             data = Categorical(data, categories=categories, ordered=ordered)
         else:
             if categories is not None:
@@ -403,7 +400,6 @@ def where(self, cond, other=None):
             other = self._na_value
         values = np.where(cond, self.values, other)
 
-        from pandas.core.categorical import Categorical
         cat = Categorical(values,
                           categories=self.categories,
                           ordered=self.ordered)
@@ -698,6 +694,7 @@ def _evaluate_compare(self, other):
         cls.__le__ = _make_compare('__le__')
         cls.__ge__ = _make_compare('__ge__')
 
+    # TODO: Can we de-duplicate this with core.categorical Delegate?
     def _delegate_method(self, name, *args, **kwargs):
         """ method delegation to the ._values """
         method = getattr(self._values, name)
@@ -708,7 +705,6 @@ def _delegate_method(self, name, *args, **kwargs):
             return res
         return CategoricalIndex(res, name=self.name)
 
-
 CategoricalIndex._add_numeric_methods_add_sub_disabled()
 CategoricalIndex._add_numeric_methods_disabled()
 CategoricalIndex._add_logical_methods_disabled()