diff options
| author | Giampaolo Rodola' <g.rodola@gmail.com> | 2013-10-26 10:58:56 +0200 |
|---|---|---|
| committer | Giampaolo Rodola' <g.rodola@gmail.com> | 2013-10-26 10:58:56 +0200 |
| commit | 7acfe8041985c5ce86abce63d6d9d2658aa0986d (patch) | |
| tree | dfff2ad901fbad8efbe59c43f911d8e52fd8cb67 /psutil/_compat.py | |
| parent | 1a11f3c130157f7efa03d41f8b5240e0d08a3fb6 (diff) | |
| download | psutil-7acfe8041985c5ce86abce63d6d9d2658aa0986d.tar.gz | |
_compat.callable: synchronize it with the version defined into six library
Diffstat (limited to 'psutil/_compat.py')
| -rw-r--r-- | psutil/_compat.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/psutil/_compat.py b/psutil/_compat.py index d10164dc..17ecc2a0 100644 --- a/psutil/_compat.py +++ b/psutil/_compat.py @@ -59,12 +59,9 @@ else: # removed in 3.0, reintroduced in 3.2 try: callable = callable -except Exception: +except NameError: def callable(obj): - for klass in type(obj).__mro__: - if "__call__" in klass.__dict__: - return True - return False + return any("__call__" in klass.__dict__ for klass in type(obj).__mro__) # --- stdlib additions |
