From ff8e26964f5cbb129e1e9e7024c4e9ad6c84318f Mon Sep 17 00:00:00 2001
From: Simon Hawkins <simonjayhawkins@gmail.com>
Date: Mon, 8 Jul 2019 17:09:22 +0100
Subject: [PATCH] BUG: Incorrect Message in KeyError with MultiIndex

---
 doc/source/whatsnew/v0.25.0.rst                  | 1 +
 pandas/core/indexes/multi.py                     | 5 ++++-
 pandas/tests/indexing/multiindex/test_getitem.py | 6 +++---
 pandas/tests/indexing/multiindex/test_loc.py     | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/doc/source/whatsnew/v0.25.0.rst b/doc/source/whatsnew/v0.25.0.rst
index 193a0edee5e96..f9173cf10b490 100644
--- a/doc/source/whatsnew/v0.25.0.rst
+++ b/doc/source/whatsnew/v0.25.0.rst
@@ -1040,6 +1040,7 @@ Indexing
 
 - Improved exception message when calling :meth:`DataFrame.iloc` with a list of non-numeric objects (:issue:`25753`).
 - Improved exception message when calling ``.iloc`` or ``.loc`` with a boolean indexer with different length (:issue:`26658`).
+- Bug in ``KeyError`` exception message when indexing a :class:`MultiIndex` with a non-existant key not displaying the original key (:issue:`27250`).
 - Bug in ``.iloc`` and ``.loc`` with a boolean indexer not raising an ``IndexError`` when too few items are passed (:issue:`26658`).
 - Bug in :meth:`DataFrame.loc` and :meth:`Series.loc` where ``KeyError`` was not raised for a ``MultiIndex`` when the key was less than or equal to the number of levels in the :class:`MultiIndex` (:issue:`14885`).
 - Bug in which :meth:`DataFrame.append` produced an erroneous warning indicating that a ``KeyError`` will be thrown in the future when the data to be appended contains new columns (:issue:`22252`).
diff --git a/pandas/core/indexes/multi.py b/pandas/core/indexes/multi.py
index 71b551adaf3ef..ff0bffacd37ad 100644
--- a/pandas/core/indexes/multi.py
+++ b/pandas/core/indexes/multi.py
@@ -2810,7 +2810,10 @@ def partial_selection(key, indexer=None):
 
                 if len(key) == self.nlevels and self.is_unique:
                     # Complete key in unique index -> standard get_loc
-                    return (self._engine.get_loc(key), None)
+                    try:
+                        return (self._engine.get_loc(key), None)
+                    except KeyError as e:
+                        raise KeyError(key) from e
                 else:
                     return partial_selection(key)
             else:
diff --git a/pandas/tests/indexing/multiindex/test_getitem.py b/pandas/tests/indexing/multiindex/test_getitem.py
index 0c61644eb46ae..145bfe168390e 100644
--- a/pandas/tests/indexing/multiindex/test_getitem.py
+++ b/pandas/tests/indexing/multiindex/test_getitem.py
@@ -83,9 +83,9 @@ def test_series_getitem_returns_scalar(
 @pytest.mark.parametrize(
     "indexer,expected_error,expected_error_msg",
     [
-        (lambda s: s.__getitem__((2000, 3, 4)), KeyError, r"^356$"),
-        (lambda s: s[(2000, 3, 4)], KeyError, r"^356$"),
-        (lambda s: s.loc[(2000, 3, 4)], KeyError, r"^356$"),
+        (lambda s: s.__getitem__((2000, 3, 4)), KeyError, r"^\(2000, 3, 4\)$"),
+        (lambda s: s[(2000, 3, 4)], KeyError, r"^\(2000, 3, 4\)$"),
+        (lambda s: s.loc[(2000, 3, 4)], KeyError, r"^\(2000, 3, 4\)$"),
         (lambda s: s.loc[(2000, 3, 4, 5)], IndexingError, "Too many indexers"),
         (lambda s: s.__getitem__(len(s)), IndexError, "index out of bounds"),
         (lambda s: s[len(s)], IndexError, "index out of bounds"),
diff --git a/pandas/tests/indexing/multiindex/test_loc.py b/pandas/tests/indexing/multiindex/test_loc.py
index 9188adc7d6e93..11dc57c3bda12 100644
--- a/pandas/tests/indexing/multiindex/test_loc.py
+++ b/pandas/tests/indexing/multiindex/test_loc.py
@@ -389,7 +389,7 @@ def test_loc_getitem_lowerdim_corner(multiindex_dataframe_random_data):
     df = multiindex_dataframe_random_data
 
     # test setup - check key not in dataframe
-    with pytest.raises(KeyError, match=r"^11$"):
+    with pytest.raises(KeyError, match=r"^\('bar', 'three'\)$"):
         df.loc[("bar", "three"), "B"]
 
     # in theory should be inserting in a sorted space????