Use list to store new handles

Author: dhimmel

pandas/formats/format.py

@@ -1455,9 +1455,9 @@ def save(self):
             f = self.path_or_buf
             close = False
         else:
-            f, new_handle = _get_handle(self.path_or_buf, self.mode,
-                                        encoding=self.encoding,
-                                        compression=self.compression)
+            f, handles = _get_handle(self.path_or_buf, self.mode,
+                                     encoding=self.encoding,
+                                     compression=self.compression)
             close = True
 
         try:

pandas/io/common.py

@@ -297,12 +297,11 @@ def _get_handle(path_or_buf, mode, encoding=None, compression=None,
     -------
     f : file-like
         A file-like object
-    new_handle : file-like or None
-        A file-like object that was openned in this function. Or None if none
-        were openned.
+    handles : list of file-like objects
+        A list of file-like object that were openned in this function.
     """
 
-    new_handle = None
+    handles = list()
     f = path_or_buf
     is_path = isinstance(path_or_buf, compat.string_types)
 
@@ -358,13 +357,15 @@ def _get_handle(path_or_buf, mode, encoding=None, compression=None,
             msg = 'Unrecognized compression type: {}'.format(compression)
             raise ValueError(msg)
 
+        handles.append(f)
+
         # In Python 3
         if compat.PY3:
             from io import TextIOWrapper
             f = TextIOWrapper(f, encoding=encoding)
+            handles.append(f)
 
-        new_handle = f
-        return f, new_handle
+        return f, handles
 
     elif is_path:
         if compat.PY2:
@@ -376,13 +377,13 @@ def _get_handle(path_or_buf, mode, encoding=None, compression=None,
         else:
             # Python 3 and no explicit encoding
             f = open(path_or_buf, mode, errors='replace')
-        new_handle = f
+        handles.append(f)
 
     # in Python 3, convert BytesIO or fileobjects passed with an encoding
     if compat.PY3 and isinstance(path_or_buf, compat.BytesIO):
         from io import TextIOWrapper
         f = TextIOWrapper(f, encoding=encoding)
-        new_handle = f
+        handles.append(f)
 
     if memory_map and hasattr(f, 'fileno'):
         try:
@@ -396,7 +397,7 @@ def _get_handle(path_or_buf, mode, encoding=None, compression=None,
             # leave the file handler as is then
             pass
 
-    return f, new_handle
+    return f, handles
 
 
 class MMapWrapper(BaseIterator):

pandas/io/json.py

@@ -259,8 +259,8 @@ def read_json(path_or_buf=None, orient=None, typ='frame', dtype=True,
             exists = False
 
         if exists:
-            fh, new_handle = _get_handle(filepath_or_buffer, 'r',
-                                         encoding=encoding)
+            fh, handles = _get_handle(filepath_or_buffer, 'r',
+                                      encoding=encoding)
             json = fh.read()
             fh.close()
         else:

pandas/io/parsers.py

@@ -1805,11 +1805,10 @@ def __init__(self, f, **kwds):
         self.comment = kwds['comment']
         self._comment_lines = []
 
-        f, new_handle = _get_handle(f, 'r', encoding=self.encoding,
-                                    compression=self.compression,
-                                    memory_map=self.memory_map)
-        if new_handle is not None:
-            self.handles.append(new_handle)
+        f, handles = _get_handle(f, 'r', encoding=self.encoding,
+                                 compression=self.compression,
+                                 memory_map=self.memory_map)
+        self.handles.extend(handles)
 
         # Set self.data to something that can read lines.
         if hasattr(f, 'readline'):