get_sheet python 3 support

python-excel · May 29, 2015 · 004c5e7 · 004c5e7
1 parent 1a8542c
commit 004c5e7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/tests/test_by_name_functions.py b/tests/test_by_name_functions.py
@@ -32,10 +32,12 @@ def test_get_by_index(self):
 
     def test_invalid_sheet_parameter(self):
         'Raises exception when sheet is not string or integer'
-        with self.assertRaises(Exception) as context:
+        try:
             self.wb.get_sheet(1.1)
-        #print context.exception
-        self.assertTrue('sheet must be integer or string' in context.exception)
+        except Exception, e:
+            self.assertTrue('sheet must be integer or string', e)
+        else:
+            self.fail('exception not raised')
 
 if __name__=='__main__':
     unittest.main()
diff --git a/xlwt/Workbook.py b/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):
     """
@@ -374,7 +374,7 @@ def add_sheet(self, sheetname, cell_overwrite_ok=False):
         return self.__worksheets[-1]
 
     def get_sheet(self, sheet):
-        if isinstance(sheet, int):
+        if isinstance(sheet, int_types):
             return self.__worksheets[sheet]
         elif isinstance(sheet, basestring):
             sheetnum = self.sheet_index(sheet)