BUG: fix MultiIndex indexing issues in #1537, python 2.5 api fix

Author: wesm

pandas/core/indexing.py

@@ -361,7 +361,10 @@ def _convert_to_indexer(self, obj, axis=0):
                 objarr = _check_bool_indexer(labels, obj)
                 return objarr
             else:
-                objarr = _asarray_tuplesafe(obj)
+                if isinstance(obj, Index):
+                    objarr = obj.values
+                else:
+                    objarr = _asarray_tuplesafe(obj)
 
                 # If have integer labels, defer to label-based indexing
                 if _is_integer_dtype(objarr) and not is_int_index:

pandas/core/series.py

@@ -477,7 +477,10 @@ def _get_with(self, key):
             if not isinstance(key, (list, np.ndarray)):  # pragma: no cover
                 key = list(key)
 
-            key_type = lib.infer_dtype(key)
+            if isinstance(key, Index):
+                key_type = lib.infer_dtype(key.values)
+            else:
+                key_type = lib.infer_dtype(key)
 
             if key_type == 'integer':
                 if self.index.inferred_type == 'integer':
@@ -564,7 +567,10 @@ def _set_with(self, key, value):
             if not isinstance(key, (list, np.ndarray)):
                 key = list(key)
 
-            key_type = lib.infer_dtype(key)
+            if isinstance(key, Index):
+                key_type = lib.infer_dtype(key.values)
+            else:
+                key_type = lib.infer_dtype(key)
 
             if key_type == 'integer':
                 if self.index.inferred_type == 'integer':
@@ -577,7 +583,10 @@ def _set_with(self, key, value):
                 self._set_labels(key, value)
 
     def _set_labels(self, key, value):
-        key = _asarray_tuplesafe(key)
+        if isinstance(key, Index):
+            key = key.values
+        else:
+            key = _asarray_tuplesafe(key)
         indexer = self.index.get_indexer(key)
         mask = indexer == -1
         if mask.any():

pandas/io/parsers.py

@@ -1150,9 +1150,9 @@ def __init__(self, path_or_buf):
                     raise ImportError(_openpyxl_msg)
         else:
             import tempfile
-            fd  = tempfile.NamedTemporaryFile(delete=False)
+            fd  = tempfile.NamedTemporaryFile()
             fd.write(path_or_buf.read())
-            fd.close()
+            fd.seek(0)
 
             try:
                 import xlrd
@@ -1162,14 +1162,7 @@ def __init__(self, path_or_buf):
                 from openpyxl.reader.excel import load_workbook
                 self.book = load_workbook(fd.name, use_iterators=True)
 
-            self.tmpfile = fd.name
-
-    def __name__(self):
-        if self.tmpfile:
-            try:
-                os.remove(self.tmpfile)
-            except Exception:
-                pass
+            self.tmpfile = fd
 
     def __repr__(self):
         return object.__repr__(self)

pandas/tests/test_multilevel.py

@@ -1394,6 +1394,16 @@ def test_join_segfault(self):
         for how in ['left', 'right', 'outer']:
             df1.join(df2, how=how)
 
+    def test_set_column_scalar_with_ix(self):
+        subset = self.frame.index[[1, 4, 5]]
+
+        self.frame.ix[subset] = 99
+        self.assert_((self.frame.ix[subset].values == 99).all())
+
+        col = self.frame['B']
+        col[subset] = 97
+        self.assert_((self.frame.ix[subset, 'B'] == 97).all())
+
 if __name__ == '__main__':
 
     # unittest.main()