Merge pull request #2076 from markotoplak/define-sheet-table

Allow choosing sheets when constructing a Table

Author: astaric

Orange/data/table.py

@@ -195,7 +195,7 @@ def __new__(cls, *args, **kwargs):
             if args[0].startswith('https://') or args[0].startswith('http://'):
                 return cls.from_url(args[0], **kwargs)
             else:
-                return cls.from_file(args[0], **kwargs)
+                return cls.from_file(args[0])
         elif isinstance(args[0], Table):
             return cls.from_table(args[0].domain, args[0])
         elif isinstance(args[0], Domain):
@@ -545,19 +545,22 @@ def save(self, filename):
         writer.write_file(filename, self)
 
     @classmethod
-    def from_file(cls, filename):
+    def from_file(cls, filename, sheet=None):
         """
         Read a data table from a file. The path can be absolute or relative.
 
         :param filename: File name
         :type filename: str
+        :param sheet: Sheet in a file (optional)
+        :type sheet: str
         :return: a new data table
         :rtype: Orange.data.Table
         """
         from Orange.data.io import FileFormat
 
         absolute_filename = FileFormat.locate(filename, dataset_dirs)
         reader = FileFormat.get_reader(absolute_filename)
+        reader.select_sheet(sheet)
         data = reader.read()
 
         # Readers return plain table. Make sure to cast it to appropriate

Orange/tests/test_xlsx_reader.py

@@ -6,7 +6,7 @@
 
 import numpy as np
 
-from Orange.data import io, ContinuousVariable, DiscreteVariable
+from Orange.data import io, ContinuousVariable, DiscreteVariable, Table
 
 
 def get_dataset(name):
@@ -48,6 +48,12 @@ def test_named_sheet(self):
         self.assertEqual(len(table.domain.attributes), 4)
         self.assertEqual(table.name, 'header_0_sheet-my_sheet')
 
+    def test_named_sheet_table(self):
+        table = Table.from_file(get_dataset("header_0_sheet.xlsx"),
+                                sheet="my_sheet")
+        self.assertEqual(len(table.domain.attributes), 4)
+        self.assertEqual(table.name, 'header_0_sheet-my_sheet')
+
 
 class TestExcelHeader1(unittest.TestCase):
     def test_no_flags(self):