@@ -2006,8 +2006,8 @@ def test_write_cells_merge_styled(self):
20062006 writer .write_cells (merge_cells , sheet_name = sheet_name )
20072007
20082008 wks = writer .sheets [sheet_name ]
2009- xcell_b1 = wks . cell ( 'B1' )
2010- xcell_a2 = wks . cell ( 'A2' )
2009+ xcell_b1 = wks [ 'B1' ]
2010+ xcell_a2 = wks [ 'A2' ]
20112011 self .assertEqual (xcell_b1 .style , openpyxl_sty_merged )
20122012 self .assertEqual (xcell_a2 .style , openpyxl_sty_merged )
20132013
@@ -2118,8 +2118,8 @@ def test_write_cells_merge_styled(self):
21182118 writer .write_cells (merge_cells , sheet_name = sheet_name )
21192119
21202120 wks = writer .sheets [sheet_name ]
2121- xcell_b1 = wks . cell ( 'B1' )
2122- xcell_a2 = wks . cell ( 'A2' )
2121+ xcell_b1 = wks [ 'B1' ]
2122+ xcell_a2 = wks [ 'A2' ]
21232123 self .assertEqual (xcell_b1 .font , openpyxl_sty_merged )
21242124 self .assertEqual (xcell_a2 .font , openpyxl_sty_merged )
21252125
@@ -2213,11 +2213,18 @@ def test_column_format(self):
22132213 writer .save ()
22142214
22152215 read_workbook = openpyxl .load_workbook (path )
2216- read_worksheet = read_workbook .get_sheet_by_name (name = 'Sheet1' )
2216+ try :
2217+ read_worksheet = read_workbook ['Sheet1' ]
2218+ except TypeError :
2219+ # compat
2220+ read_worksheet = read_workbook .get_sheet_by_name (name = 'Sheet1' )
22172221
2218- # Get the number format from the cell. This method is backward
2219- # compatible with older versions of openpyxl.
2220- cell = read_worksheet .cell ('B2' )
2222+ # Get the number format from the cell.
2223+ try :
2224+ cell = read_worksheet ['B2' ]
2225+ except TypeError :
2226+ # compat
2227+ cell = read_worksheet .cell ('B2' )
22212228
22222229 try :
22232230 read_num_format = cell .number_format
0 commit comments