Clean up uses of .values, ._values, ._ndarray_values, ._data

pandas-dev · jreback · Oct 25, 2018 · Sep 26, 2018 · Sep 27, 2018 · Sep 27, 2018
commit ca4a7fd378925eef621c6fb2bdadcd86036a5f03
diff --git a/pandas/core/arrays/period.py b/pandas/core/arrays/period.py
@@ -187,7 +187,7 @@ def _from_sequence(cls, scalars, dtype=None, copy=False):
         return cls(ordinals, freq=freq)
 
     def _values_for_factorize(self):
-        return self.values, iNaT
+        return self._ndarray_values, iNaT
 
     @classmethod
     def _from_factorized(cls, values, original):
@@ -457,7 +457,7 @@ def _time_shift(self, n, freq=None):
         freq : pandas.DateOffset, pandas.Timedelta, or string
             Frequency increment to shift by.
         """
-        values = self.values + n * self.freq.n
+        values = self._ndarray_values + n * self.freq.n
         if self.hasnans:
             values[self._isnan] = iNaT
         return type(self)(values, freq=self.freq)
@@ -819,7 +819,7 @@ def astype(self, dtype, copy=True):
     def _item(self):
         if len(self) == 1:
             # IndexOpsMixin will catch and re-raise IndexErrors
-            return Period._from_ordinal(self.values[0], self.freq)
+            return Period._from_ordinal(self._ndarray_values[0], self.freq)
         else:
             raise ValueError('can only convert an array of size 1 to a '
                              'Python scalar')

diff --git a/pandas/core/indexes/period.py b/pandas/core/indexes/period.py
@@ -279,10 +279,15 @@ def _simple_new(cls, values, name=None, freq=None, **kwargs):
     # Data
     @property
     def _ndarray_values(self):
-        return self.values.values
+        return self._data._ndarray_values
 
     @property
     def values(self):
+        # TODO: Discussion on what this should be.
+        return self._data
+
+    @property
+    def _values(self):
         return self._data
 
     @property
@@ -307,7 +312,7 @@ def freq(self, value):
     def _shallow_copy(self, values=None, **kwargs):
         # TODO: simplify, figure out type of values
         if values is None:
-            values = self._values
+            values = self._data
 
         if isinstance(values, type(self)):
             values = values.values
@@ -912,7 +917,7 @@ def _create_comparison_method(cls, op):
         """
         # TODO(DatetimeArray): move to base class.
         def wrapper(self, other):
-            return op(self.values, other)
+            return op(self._data, other)
 
         wrapper.__doc__ = op.__doc__
         wrapper.__name__ = '__{}__'.format(op.__name__)
@@ -948,7 +953,7 @@ def item(self):
         # TODO(DatetimeArray): remove
         # override to use _item
         try:
-            return self.values._item()
+            return self._data._item()
         except IndexError:
             # copy numpy's message here because Py26 raises an IndexError
             raise ValueError('can only convert an array of size 1 to a '
@@ -960,7 +965,7 @@ def data(self):
         warnings.warn("{obj}.data is deprecated and will be removed "
                       "in a future version".format(obj=type(self).__name__),
                       FutureWarning, stacklevel=2)
-        return np.asarray(self.values).data
+        return np.asarray(self._data).data
 
     @property
     def base(self):
@@ -970,7 +975,7 @@ def base(self):
         warnings.warn("{obj}.base is deprecated and will be removed "
                       "in a future version".format(obj=type(self).__name__),
                       FutureWarning, stacklevel=2)
-        return np.asarray(self.values)
+        return np.asarray(self._data)
 
 
 PeriodIndex._add_comparison_ops()