Skip to content

use simpler callable check for meta_eval #323

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
SylvainCorlay merged 1 commit into from
Sep 23, 2016
Merged

use simpler callable check for meta_eval #323

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions traitlets/traitlets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,7 +1381,7 @@ def class_traits(cls, **metadata):
result = {}
for name, trait in traits.items():
for meta_name, meta_eval in metadata.items():
if type(meta_eval) is not types.FunctionType:
if not callable(meta_eval):
meta_eval = _SimpleTest(meta_eval)
if not meta_eval(trait.metadata.get(meta_name, None)):
break
Expand Down Expand Up @@ -1431,7 +1431,7 @@ def traits(self, **metadata):
result = {}
for name, trait in traits.items():
for meta_name, meta_eval in metadata.items():
if type(meta_eval) is not types.FunctionType:
if not callable(meta_eval):
meta_eval = _SimpleTest(meta_eval)
if not meta_eval(trait.metadata.get(meta_name, None)):
break
Expand Down