Skip to content

Commit 7bbe910

Browse files
committed
Address comments of @gfyoung in pandas-dev#25153
1 parent 3ab9318 commit 7bbe910

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

pandas/io/excel/_base.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -590,9 +590,8 @@ def __new__(cls, path, engine=None, **kwargs):
590590
if engine == 'auto':
591591
engine = _get_default_writer(ext)
592592
except KeyError:
593-
error = ValueError("No engine for filetype: '{ext}'"
594-
.format(ext=ext))
595-
raise error
593+
raise ValueError("No engine for filetype: '{ext}'"
594+
.format(ext=ext))
596595
cls = get_writer(engine)
597596

598597
return object.__new__(cls)

pandas/io/excel/_util.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
from pandas.core import config
99

10-
_writer_extensions = ["xlsx", "xls", "xlsm"]
10+
11+
# the following extensions are already registered in pandas/core/config_init.py
12+
_registered_writer_extensions = ["xlsx", "xls", "xlsm"]
1113

1214

1315
_writers = {}
@@ -24,13 +26,15 @@ def register_writer(klass):
2426
for ext in klass.supported_extensions:
2527
if ext.startswith('.'):
2628
ext = ext[1:]
27-
if ext not in _writer_extensions:
29+
if ext not in _registered_writer_extensions:
2830
config.register_option("io.excel.{ext}.writer".format(ext=ext),
2931
engine_name, validator=str)
30-
_writer_extensions.append(ext)
32+
_registered_writer_extensions.append(ext)
3133

3234

3335
def _get_default_writer(ext):
36+
"""Return the default writer per extension. This default engine is used
37+
unles another engine is explicitly defined."""
3438
_default_writers = {'xlsx': 'openpyxl', 'xlsm': 'openpyxl', 'xls': 'xlwt'}
3539
try:
3640
import xlsxwriter # noqa
@@ -230,8 +234,6 @@ def _fill_mi_header(row, control_row):
230234

231235
return _maybe_convert_to_string(row), control_row
232236

233-
# fill blank if index_col not None
234-
235237

236238
def _pop_header_name(row, index_col):
237239
"""

0 commit comments

Comments
 (0)