From fe68b30dacec3255b023fcefac5c9095d96a692f Mon Sep 17 00:00:00 2001 From: wiggin15 Date: Mon, 13 Nov 2017 00:38:12 +0200 Subject: Move exceptions to separate file (#1174) --- psutil/_pslinux.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'psutil/_pslinux.py') diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py index 2fec8ea7..228dbd98 100644 --- a/psutil/_pslinux.py +++ b/psutil/_pslinux.py @@ -41,6 +41,10 @@ from ._compat import b from ._compat import basestring from ._compat import long from ._compat import PY3 +from ._exceptions import NoSuchProcess +from ._exceptions import ZombieProcess +from ._exceptions import AccessDenied +from ._exceptions import TimeoutExpired if sys.version_info >= (3, 4): import enum @@ -137,12 +141,6 @@ TCP_STATUSES = { "0B": _common.CONN_CLOSING } -# these get overwritten on "import psutil" from the __init__.py file -NoSuchProcess = None -ZombieProcess = None -AccessDenied = None -TimeoutExpired = None - # ===================================================================== # --- named tuples -- cgit v1.2.1 From 100391f880ef2a2c5b124bba4b0722623f3edb3e Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sun, 12 Nov 2017 23:41:30 +0100 Subject: sort imports by name --- psutil/_pslinux.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'psutil/_pslinux.py') diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py index 228dbd98..fc38fb14 100644 --- a/psutil/_pslinux.py +++ b/psutil/_pslinux.py @@ -41,10 +41,10 @@ from ._compat import b from ._compat import basestring from ._compat import long from ._compat import PY3 -from ._exceptions import NoSuchProcess -from ._exceptions import ZombieProcess from ._exceptions import AccessDenied +from ._exceptions import NoSuchProcess from ._exceptions import TimeoutExpired +from ._exceptions import ZombieProcess if sys.version_info >= (3, 4): import enum -- cgit v1.2.1 From 40573cbe58407a3f8dfcb0c3b71237444b10fc0a Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Mon, 13 Nov 2017 00:00:30 +0100 Subject: #1174: use TimeoutExpired in wait_pid() --- psutil/_pslinux.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'psutil/_pslinux.py') diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py index fc38fb14..3fe62c5c 100644 --- a/psutil/_pslinux.py +++ b/psutil/_pslinux.py @@ -43,7 +43,6 @@ from ._compat import long from ._compat import PY3 from ._exceptions import AccessDenied from ._exceptions import NoSuchProcess -from ._exceptions import TimeoutExpired from ._exceptions import ZombieProcess if sys.version_info >= (3, 4): @@ -1534,10 +1533,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 create_time(self): -- cgit v1.2.1