Merge branch 'index-values' into pandas-array-upstream+fu1

Author: TomAugspurger

pandas/core/base.py

@@ -13,7 +13,6 @@
     is_list_like,
     is_scalar,
     is_datetimelike,
-    is_categorical_dtype,
     is_extension_type,
     is_extension_array_dtype)
 
@@ -712,7 +711,7 @@ def transpose(self, *args, **kwargs):
     @property
     def shape(self):
         """ return a tuple of the shape of the underlying data """
-        return self._ndarray_values.shape
+        return self._values.shape
 
     @property
     def ndim(self):
@@ -755,7 +754,7 @@ def strides(self):
     @property
     def size(self):
         """ return the number of elements in the underlying data """
-        return self._ndarray_values.size
+        return self._values.size
 
     @property
     def flags(self):

pandas/core/indexes/datetimes.py

@@ -694,6 +694,20 @@ def tzinfo(self):
         """
         return self.tz
 
+    @property
+    def size(self):
+        # TODO: Remove this when we have a DatetimeTZArray
+        # Necessary to avoid recursion error since DTI._values is a DTI
+        # for TZ-aware
+        return self._ndarray_values.size
+
+    @property
+    def shape(self):
+        # TODO: Remove this when we have a DatetimeTZArray
+        # Necessary to avoid recursion error since DTI._values is a DTI
+        # for TZ-aware
+        return self._ndarray_values.shape
+
     @cache_readonly
     def _timezone(self):
         """ Comparable timezone both for pytz / dateutil"""

pandas/core/indexes/interval.py

@@ -680,6 +680,16 @@ def length(self):
                    'e.g. Intervals with string endpoints')
             raise TypeError(msg)
 
+    @property
+    def size(self):
+        # Avoid materializing self.values
+        return self.left.size
+
+    @property
+    def shape(self):
+        # Avoid materializing self.values
+        return self.left.shape
+
     def __len__(self):
         return len(self.left)
 

pandas/core/indexes/period.py

@@ -477,6 +477,16 @@ def _to_embed(self, keep_tz=False, dtype=None):
 
         return self.astype(object).values
 
+    @property
+    def size(self):
+        # Avoid materializing self._values
+        return self._ndarray_values.size
+
+    @property
+    def shape(self):
+        # Avoid materializing self._values
+        return self._ndarray_values.shape
+
     @property
     def _formatter_func(self):
         return lambda x: "'%s'" % x