summaryrefslogtreecommitdiff
path: root/psutil/_psosx.py
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-11-13 00:00:30 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2017-11-13 00:00:30 +0100
commit40573cbe58407a3f8dfcb0c3b71237444b10fc0a (patch)
tree3ef2d6e9e50fdb89b475f83ae45ff690351a52f0 /psutil/_psosx.py
parent100391f880ef2a2c5b124bba4b0722623f3edb3e (diff)
downloadpsutil-40573cbe58407a3f8dfcb0c3b71237444b10fc0a.tar.gz
#1174: use TimeoutExpired in wait_pid()
Diffstat (limited to 'psutil/_psosx.py')
-rw-r--r--psutil/_psosx.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/psutil/_psosx.py b/psutil/_psosx.py
index 583ed355..e9b6ed82 100644
--- a/psutil/_psosx.py
+++ b/psutil/_psosx.py
@@ -25,7 +25,6 @@ from ._common import socktype_to_enum
from ._common import usage_percent
from ._exceptions import AccessDenied
from ._exceptions import NoSuchProcess
-from ._exceptions import TimeoutExpired
from ._exceptions import ZombieProcess
@@ -500,10 +499,7 @@ class Process(object):
@wrap_exceptions
def wait(self, timeout=None):
- try:
- return _psposix.wait_pid(self.pid, timeout)
- except _psposix.TimeoutExpired:
- raise TimeoutExpired(timeout, self.pid, self._name)
+ return _psposix.wait_pid(self.pid, timeout, self._name)
@wrap_exceptions
def nice_get(self):