Skip to content

Raise OptionError instead of KeyError in __getattr__. Fixes #19789. #19790

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 9 commits into from
Feb 24, 2018
Merged

Raise OptionError instead of KeyError in __getattr__. Fixes #19789. #19790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cb131b3
Raise OptionError instead of KeyError in __getattr__. Fixes #19789.
jayfoad Feb 20, 2018
2adb51b
Fix PEP8 issue.
jayfoad Feb 20, 2018
4d7e5ac
Add a test.
jayfoad Feb 21, 2018
8d4f6d6
Use try/except instead.
jayfoad Feb 21, 2018
8a00b3b
Add a whatsnew.
jayfoad Feb 21, 2018
7dc1bb1
More informative whatsnew.
jayfoad Feb 21, 2018
57ba55b
Add issue number and check for OptionError explicitly.
jayfoad Feb 23, 2018
232bf16
Merge branch 'master' into PR_TOOL_MERGE_PR_19790
jreback Feb 24, 2018
ac53036
doc
jreback Feb 24, 2018
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
1 change: 1 addition & 0 deletions doc/source/whatsnew/v0.23.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,3 +908,4 @@ Other
^^^^^

- Improved error message when attempting to use a Python keyword as an identifier in a ``numexpr`` backed query (:issue:`18221`)
- Bug in accessing a :func:`pandas.get_option`, which raised ``KeyError`` rather than ``OptionError`` when looking up a non-existant option key in some cases (:issue:`19789`)
5 changes: 4 additions & 1 deletion pandas/core/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,10 @@ def __getattr__(self, key):
if prefix:
prefix += "."
prefix += key
v = object.__getattribute__(self, "d")[key]
try:
v = object.__getattribute__(self, "d")[key]
except KeyError:
raise OptionError("No such option")
if isinstance(v, dict):
return DictWrapper(v, prefix)
else:
Expand Down
6 changes: 6 additions & 0 deletions pandas/tests/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,3 +428,9 @@ def test_option_context_scope(self):

# Ensure the current context is reset
assert self.cf.get_option(option_name) == original_value

def test_dictwrapper_getattr(self):
options = self.cf.options
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use an with pytest.raises here to check for the OptionError

Copy link
Contributor Author

@jayfoad jayfoad Feb 23, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As well as the hasattr test or instead of it? hasattr already tests for AttributeError.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add the issue number as a comment here

# GH 19789
pytest.raises(self.cf.OptionError, getattr, options, 'bananas')
assert not hasattr(options, 'bananas')