diff options
Diffstat (limited to 'psutil/_psaix.py')
| -rw-r--r-- | psutil/_psaix.py | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/psutil/_psaix.py b/psutil/_psaix.py index c78922b0..9abc8d17 100644 --- a/psutil/_psaix.py +++ b/psutil/_psaix.py @@ -28,6 +28,9 @@ from ._common import sockfam_to_enum from ._common import socktype_to_enum from ._common import usage_percent from ._compat import PY3 +from ._exceptions import AccessDenied +from ._exceptions import NoSuchProcess +from ._exceptions import ZombieProcess __extra__all__ = ["PROCFS_PATH"] @@ -76,12 +79,6 @@ proc_info_map = dict( status=6, ttynr=7) -# these get overwritten on "import psutil" from the __init__.py file -NoSuchProcess = None -ZombieProcess = None -AccessDenied = None -TimeoutExpired = None - # ===================================================================== # --- named tuples @@ -561,13 +558,7 @@ class Process(object): @wrap_exceptions def wait(self, timeout=None): - try: - return _psposix.wait_pid(self.pid, timeout) - except _psposix.TimeoutExpired: - # support for private module import - if TimeoutExpired is None: - raise - raise TimeoutExpired(timeout, self.pid, self._name) + return _psposix.wait_pid(self.pid, timeout, self._name) @wrap_exceptions def io_counters(self): |