diff options
author | Giampaolo Rodola' <g.rodola@gmail.com> | 2013-04-11 15:18:03 +0200 |
---|---|---|
committer | Giampaolo Rodola' <g.rodola@gmail.com> | 2013-04-11 15:18:03 +0200 |
commit | a26c6b7ef7b54b5baff421b4d59ad1f062c0a670 (patch) | |
tree | 8572ba1ea40e6ac738e3a3ac4273037dadee90ed | |
parent | b1aa590fafde5cbf312de5ef81640c7a06f887d7 (diff) | |
parent | f36141dd6d25a9463bbc30f97142db0a027aa32b (diff) | |
download | psutil-a26c6b7ef7b54b5baff421b4d59ad1f062c0a670.tar.gz |
merge heads
-rw-r--r-- | psutil/__init__.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/psutil/__init__.py b/psutil/__init__.py index 1d444fcb..c86a23da 100644 --- a/psutil/__init__.py +++ b/psutil/__init__.py @@ -192,15 +192,17 @@ class Process(object): AccessDenied exception is raised when retrieving that particular process information. """ - excluded_names = set(['send_signal', 'suspend', 'resume', 'nice' - 'terminate', 'kill', 'wait', 'is_running', - 'as_dict', 'parent', 'get_children']) + excluded_names = set(['send_signal', 'suspend', 'resume', 'terminate', + 'kill', 'wait', 'is_running', 'as_dict', 'parent', + 'get_children', 'nice']) retdict = dict() - for name in set(attrs or dir(self)) - excluded_names: + for name in set(attrs or dir(self)): if name.startswith('_'): continue if name.startswith('set_'): continue + if name in excluded_names: + continue try: attr = getattr(self, name) if callable(attr): |