Merge pull request #4837 from jtratner/fix-tuple-index-series-exception

ENH: Better Exception when trying to set on Series with tuple-index.

Author: jtratner

doc/source/release.rst

@@ -118,6 +118,8 @@ Improvements to existing features
     thanks @lgautier
   - DataFrame constructor now accepts a numpy masked record array (:issue:`3478`),
     thanks @jnothman
+  - ``__getitem__`` with ``tuple`` key (e.g., ``[:, 2]``) on ``Series``
+    without ``MultiIndex`` raises ``ValueError`` (:issue:`4759`, :issue:`4837`)
 
 API Changes
 ~~~~~~~~~~~

pandas/core/series.py

@@ -1050,6 +1050,8 @@ def __setitem__(self, key, value):
             return
 
         except TypeError as e:
+            if isinstance(key, tuple) and not isinstance(self.index, MultiIndex):
+                raise ValueError("Can only tuple-index with a MultiIndex")
             # python 3 type errors should be raised
             if 'unorderable' in str(e):  # pragma: no cover
                 raise IndexError(key)

pandas/tests/test_series.py

@@ -1025,10 +1025,10 @@ def test_setslice(self):
 
     def test_basic_getitem_setitem_corner(self):
         # invalid tuples, e.g. self.ts[:, None] vs. self.ts[:, 2]
-        self.assertRaises(Exception, self.ts.__getitem__,
-                          (slice(None, None), 2))
-        self.assertRaises(Exception, self.ts.__setitem__,
-                          (slice(None, None), 2), 2)
+        with tm.assertRaisesRegexp(ValueError, 'tuple-index'):
+            self.ts[:, 2]
+        with tm.assertRaisesRegexp(ValueError, 'tuple-index'):
+            self.ts[:, 2] = 2
 
         # weird lists. [slice(0, 5)] will work but not two slices
         result = self.ts[[slice(None, 5)]]