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

Author: TomAugspurger

pandas/core/base.py

@@ -745,7 +745,7 @@ def itemsize(self):
     @property
     def nbytes(self):
         """ return the number of bytes in the underlying data """
-        return self._ndarray_values.nbytes
+        return self.values.nbytes
 
     @property
     def strides(self):

pandas/core/dtypes/concat.py

@@ -480,7 +480,7 @@ def _concat_datetimetz(to_concat, name=None):
 
 def _concat_index_same_dtype(indexes, klass=None):
     klass = klass if klass is not None else indexes[0].__class__
-    return klass(np.concatenate([x._ndarray_values for x in indexes]))
+    return klass(np.concatenate([x._values for x in indexes]))
 
 
 def _concat_index_asobject(to_concat, name=None):

pandas/core/indexes/category.py

@@ -295,13 +295,9 @@ def values(self):
 
     @property
     def itemsize(self):
+        # Size of the items in categories, not codes.
         return self.values.itemsize
 
-    @property
-    def nbytes(self):
-        """ return the number of bytes in the underlying data """
-        return self.values.nbytes
-
     def get_values(self):
         """ return the underlying data as an ndarray """
         return self._data.get_values()

pandas/core/indexes/multi.py

@@ -1319,7 +1319,7 @@ def from_tuples(cls, tuples, sortorder=None, names=None):
             arrays = [[]] * len(names)
         elif isinstance(tuples, (np.ndarray, Index)):
             if isinstance(tuples, Index):
-                tuples = tuples._ndarray_values
+                tuples = tuples._values
 
             arrays = list(lib.tuples_to_object_array(tuples).T)
         elif isinstance(tuples, list):

pandas/io/formats/format.py

@@ -1897,7 +1897,7 @@ def _format(x):
 
         vals = self.values
         if isinstance(vals, Index):
-            vals = vals._ndarray_values
+            vals = vals._values
         elif isinstance(vals, ABCSparseArray):
             vals = vals.values
 

pandas/tests/indexes/datetimes/test_datetime.py

@@ -477,10 +477,4 @@ def test_factorize_dst(self):
     ])
     def test_unique(self, arr, expected):
         result = arr.unique()
-
-        if isinstance(expected, np.ndarray):
-            tm.assert_numpy_array_equal(result, expected)
-        if isinstance(expected, pd.Series):
-            tm.assert_series_equal(result, expected)
-        if isinstance(expected, pd.DatetimeIndex):
-            tm.assert_index_equal(result, expected)
+        tm.assert_index_equal(result, expected)