engine is xlrd and io is an xlrd workbook works as before again

Author: davidovitch

pandas/io/excel.py

@@ -72,6 +72,8 @@ def get_writer(engine_name):
 class BaseFile(object):
     """ Class for identifying the type of reader
     """
+    # added in order to deal with both Open Document Format and MS Excel
+    # fil types, see PR #9070
 
     def __init__(self, engine, extensions, io_class, open_workbook,
                  try_engine=False):
@@ -272,21 +274,22 @@ def __init__(self, io, **kwds):
                     self.book = io
                     return
 
-        if self.engine == xlrd_f.engine:
+        if self.engine == xlrd_f.engine and isinstance(io, xlrd_f.io_class):
             # force import error when necessary
             import xlrd
-            self.book = xlrd_f.open_workbook(io)
-        elif self.engine == ezodf_f.engine:
-            # force import error when necessary
-            import ezodf
-            self.book = ezodf_f.open_workbook(io)
-        elif hasattr(io, "read"):
+            self.book = io
+        elif not isinstance(io, xlrd_f.io_class) and hasattr(io, "read"):
             # N.B. xlrd.Book has a read attribute too
             data = io.read()
-            # this only works with xlrd
             import xlrd
             self.book = xlrd.open_workbook(file_contents=data)
             self.engine = 'xlrd'
+        elif self.engine == xlrd_f.engine:
+            self.book = xlrd_f.open_workbook(io)
+        elif self.engine == ezodf_f.engine:
+            # force import error when necessary
+            import ezodf
+            self.book = ezodf_f.open_workbook(io)
         else:
             raise ValueError('Must explicitly set engine if not passing in'
                              ' buffer or path for io.')
@@ -546,6 +549,7 @@ def _parse_ods(self, sheetname=0, header=0, skiprows=None, skip_footer=0,
                    parse_dates=False, date_parser=None, na_values=None,
                    thousands=None, chunksize=None, convert_float=True,
                    verbose=False, **kwds):
+        # adds support for parsing ODS files, see PR #9070
 
         def _parse_cell(cell):
             """converts the contents of the cell into a pandas