Skip to content

Commit 955c7bb

Browse files
Clean up code
1 parent 8639f65 commit 955c7bb

File tree

1 file changed

+10
-20
lines changed

1 file changed

+10
-20
lines changed

pandas/io/excel/_odswriter.py

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# import pandas._libs.json as json
55

66
from pandas.io.excel._base import ExcelWriter
7+
78
# from pandas.io.excel._util import _validate_freeze_panes
89

910
from odf.opendocument import OpenDocumentSpreadsheet
@@ -49,7 +50,6 @@ def write_cells(
4950
wks = self.sheets[sheet_name]
5051
else:
5152
wks = Table(name=sheet_name)
52-
# wks = self.book.add_sheet(sheet_name) (do at the end or immediately? FIXME)
5353
self.sheets[sheet_name] = wks
5454

5555
# if _validate_freeze_panes(freeze_panes):
@@ -66,8 +66,10 @@ def write_cells(
6666
attributes = {}
6767
print(cell.row, cell.col, cell.val, cell.mergestart, cell.mergeend)
6868
if cell.mergestart is not None and cell.mergeend is not None:
69-
attributes = {"numberrowsspanned": max(1, cell.mergestart),
70-
"numbercolumnsspanned": cell.mergeend}
69+
attributes = {
70+
"numberrowsspanned": max(1, cell.mergestart),
71+
"numbercolumnsspanned": cell.mergeend,
72+
}
7173
# fill with empty cells if needed
7274
for _ in range(cell.col - col_count[cell.row]):
7375
rows[cell.row].addElement(TableCell())
@@ -79,7 +81,6 @@ def write_cells(
7981
value = str(val).lower()
8082
pvalue = str(val).upper()
8183
if isinstance(val, datetime.datetime):
82-
print('datetime', val.strftime("%Y-%m-%d"), val.strftime("%x"))
8384
if val.time():
8485
value = val.isoformat()
8586
pvalue = val.strftime("%c")
@@ -88,11 +89,8 @@ def write_cells(
8889
pvalue = val.strftime("%x")
8990
tc = TableCell(valuetype="date", datevalue=value, attributes=attributes)
9091
elif isinstance(val, datetime.date):
91-
print('date', val.strftime("%Y-%m-%d"), val.strftime("%x"))
9292
value = val.strftime("%Y-%m-%d")
9393
pvalue = val.strftime("%x")
94-
# value = val.isoformat()
95-
# pvalue = val.strftime("%c")
9694
tc = TableCell(valuetype="date", datevalue=value, attributes=attributes)
9795
else:
9896
class_to_cell_type = {
@@ -101,7 +99,11 @@ def write_cells(
10199
float: "float",
102100
bool: "boolean",
103101
}
104-
tc = TableCell(valuetype=class_to_cell_type[type(val)], value=value, attributes=attributes)
102+
tc = TableCell(
103+
valuetype=class_to_cell_type[type(val)],
104+
value=value,
105+
attributes=attributes,
106+
)
105107
rows[cell.row].addElement(tc)
106108
col_count[cell.row] += 1
107109
p = P(text=pvalue)
@@ -116,18 +118,6 @@ def write_cells(
116118
else:
117119
style = self._convert_to_style(cell.style, fmt)
118120
style_dict[stylekey] = style
119-
120-
if cell.mergestart is not None and cell.mergeend is not None:
121-
wks.write_merge(
122-
startrow + cell.row,
123-
startrow + cell.mergestart,
124-
startcol + cell.col,
125-
startcol + cell.mergeend,
126-
val,
127-
style,
128-
)
129-
else:
130-
wks.write(startrow + cell.row, startcol + cell.col, val, style)
131121
"""
132122
for row_nr in range(max(rows.keys()) + 1):
133123
wks.addElement(rows[row_nr])

0 commit comments

Comments
 (0)