From 89350689fdb934b49e173035c29157947082f8d9 Mon Sep 17 00:00:00 2001 From: Dr-Irv Date: Thu, 23 Feb 2017 10:12:45 -0500 Subject: [PATCH] resolve conflicts --- pandas/indexes/multi.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pandas/indexes/multi.py b/pandas/indexes/multi.py index 4e721a06eef2c..d01edad10a9d1 100644 --- a/pandas/indexes/multi.py +++ b/pandas/indexes/multi.py @@ -846,7 +846,7 @@ def _try_mi(k): raise InvalidIndexError(key) - def _get_level_values(self, level): + def _get_level_values(self, level, copy=True): """ Return vector of label values for requested level, equal to the length of the index @@ -856,6 +856,7 @@ def _get_level_values(self, level): Parameters ---------- level : int level + copy : bool whether copy of results should be done Returns ------- @@ -866,7 +867,11 @@ def _get_level_values(self, level): labels = self.labels[level] filled = algos.take_1d(unique._values, labels, fill_value=unique._na_value) - return filled + if copy: + values = unique._shallow_copy(filled) + else: + values = filled + return values def get_level_values(self, level): """ @@ -882,7 +887,7 @@ def get_level_values(self, level): values : Index """ level = self._get_level_number(level) - values = self._get_level_values(level) + values = self._get_level_values(level, copy=False) return self.levels[level]._shallow_copy(values) def format(self, space=2, sparsify=None, adjoin=True, names=False,