@@ -2006,8 +2006,8 @@ def test_write_cells_merge_styled(self):
2006
2006
writer .write_cells (merge_cells , sheet_name = sheet_name )
2007
2007
2008
2008
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' ]
2011
2011
self .assertEqual (xcell_b1 .style , openpyxl_sty_merged )
2012
2012
self .assertEqual (xcell_a2 .style , openpyxl_sty_merged )
2013
2013
@@ -2118,8 +2118,8 @@ def test_write_cells_merge_styled(self):
2118
2118
writer .write_cells (merge_cells , sheet_name = sheet_name )
2119
2119
2120
2120
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' ]
2123
2123
self .assertEqual (xcell_b1 .font , openpyxl_sty_merged )
2124
2124
self .assertEqual (xcell_a2 .font , openpyxl_sty_merged )
2125
2125
@@ -2213,11 +2213,18 @@ def test_column_format(self):
2213
2213
writer .save ()
2214
2214
2215
2215
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' )
2217
2221
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' )
2221
2228
2222
2229
try :
2223
2230
read_num_format = cell .number_format
0 commit comments