fix #16: where only stream instance could be passed to file_stream whereas using read() applies to both stream and file handle

Author: chfw

pyexcel_xls/xls.py

@@ -126,9 +126,11 @@ def _get_book(self, on_demand=False):
         if self._file_name:
             xls_book = xlrd.open_workbook(self._file_name, on_demand=on_demand)
         elif self._file_stream:
+            self._file_stream.seek(0)
+            file_content = self._file_stream.read()
             xls_book = xlrd.open_workbook(
                 None,
-                file_contents=self._file_stream.getvalue(),
+                file_contents=file_content,
                 on_demand=on_demand
             )
         elif self._file_content is not None:

tests/test_bug_fixes.py

@@ -62,5 +62,11 @@ def test_issue_13_empty_file_content():
     pe.get_sheet(file_content='', file_type='xls')
 
 
+def test_issue_16_file_stream_has_no_getvalue():
+    test_file = get_fixture("hidden_sheets.xls")
+    with open(test_file, 'rb') as f:
+        pe.get_sheet(file_stream=f, file_type='xls')
+
+
 def get_fixture(file_name):
     return os.path.join("tests", "fixtures", file_name)