Skip to content

BUG: read_excel failing to check older xlrd versions properly #39355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Feb 1, 2021
Merged

BUG: read_excel failing to check older xlrd versions properly #39355

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
37e96c7
Update _base.py
lithomas1 Jan 23, 2021
cf3b8ce
Update v1.2.2.rst
lithomas1 Jan 23, 2021
570e60d
Update v1.2.2.rst
lithomas1 Jan 23, 2021
7bd431d
Update _base.py
lithomas1 Jan 25, 2021
060bf8d
Update __init__.py
lithomas1 Jan 25, 2021
3aa8205
Fix formatting
lithomas1 Jan 25, 2021
f2d52c6
Address code review
lithomas1 Jan 28, 2021
675c297
Merge branch 'master' into xlrd-version-check
lithomas1 Jan 28, 2021
95cdcd4
Update doc/source/whatsnew/v1.2.2.rst
lithomas1 Jan 30, 2021
5dd7f6f
Make get_version public
lithomas1 Jan 30, 2021
2b02339
Merge branch 'master' into xlrd-version-check
lithomas1 Jan 30, 2021
47d6a1d
Update validate_unwanted_patterns.py
lithomas1 Jan 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/source/whatsnew/v1.2.2.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Fixed regressions
Bug fixes
~~~~~~~~~

-
- Fixed bug in :meth:``read_excel`` that caused it to fail when checking version of older xlrd versions(:issue:`38955`)
-

.. ---------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions pandas/io/excel/_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

from pandas._libs.parsers import STR_NA_VALUES
from pandas._typing import Buffer, DtypeArg, FilePathOrBuffer, StorageOptions
from pandas.compat._optional import import_optional_dependency
from pandas.compat._optional import _get_version, import_optional_dependency
from pandas.errors import EmptyDataError
from pandas.util._decorators import Appender, deprecate_nonkeyword_arguments, doc

Expand Down Expand Up @@ -1056,7 +1056,7 @@ def __init__(
else:
import xlrd

xlrd_version = LooseVersion(xlrd.__version__)
xlrd_version = _get_version(xlrd)

if xlrd_version is not None and isinstance(path_or_buffer, xlrd.Book):
ext = "xls"
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/io/excel/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import pytest

from pandas.compat._optional import import_optional_dependency
from pandas.compat._optional import _get_version, import_optional_dependency

pytestmark = [
pytest.mark.filterwarnings(
Expand All @@ -29,4 +29,4 @@
else:
import xlrd

xlrd_version = LooseVersion(xlrd.__version__)
xlrd_version = _get_version(xlrd)