Merge 3319144 into 917a8ad

tests/test_by_name_functions.py

@@ -0,0 +1,30 @@
+import unittest
+import xlwt
+
+class TestByName(unittest.TestCase):
+    def setUp(self):
+        self.wb = xlwt.Workbook()
+        self.wb.add_sheet('Plan1')    
+        self.wb.add_sheet('Plan2')
+        self.wb.add_sheet('Plan3')
+        self.wb.add_sheet('Plan4')
+
+    def test_sheet_index(self):
+        'Return sheet index by sheet name'
+        idx = self.wb.sheet_index('Plan3')
+        self.assertEqual(2, idx)
+
+    def test_get_by_name(self):
+        'Get sheet by name'
+        ws = self.wb.get_sheet('Plan2')
+        self.assertEqual('Plan2', ws.name)
+
+    def test_get_by_index(self):
+        'Get sheet by index'
+        ws = self.wb.get_sheet(1)
+        self.assertEqual('Plan2', ws.name)
+
+    def test_invalid_sheet_parameter(self):
+        'Raises exception when sheet is not string or integer'
+        self.assertRaises(Exception, self.wb.get_sheet, 1.1)
+

xlwt/Workbook.py

@@ -40,7 +40,7 @@
 
 from . import BIFFRecords
 from . import Style
-from .compat import unicode_type
+from .compat import unicode_type, int_types, basestring
 
 class Workbook(object):
     """
@@ -373,8 +373,22 @@ def add_sheet(self, sheetname, cell_overwrite_ok=False):
         self.__worksheets.append(Worksheet(sheetname, self, cell_overwrite_ok))
         return self.__worksheets[-1]
 
-    def get_sheet(self, sheetnum):
-        return self.__worksheets[sheetnum]
+    def get_sheet(self, sheet):
+        if isinstance(sheet, int_types):
+            return self.__worksheets[sheet]
+        elif isinstance(sheet, basestring):
+            sheetnum = self.sheet_index(sheet)
+            return self.__worksheets[sheetnum]
+        else:
+            raise Exception("sheet must be integer or string")
+
+    def sheet_index(self, sheetname):
+        try:
+            sheetnum = self.__worksheet_idx_from_name[sheetname.lower()] 
+        except KeyError:
+            self.raise_bad_sheetname(sheetname)
+
+        return sheetnum       
 
     def raise_bad_sheetname(self, sheetname):
         raise Exception("Formula: unknown sheet name %s" % sheetname)