From 5ba055a8e514698058589d3b615d408767a6e330 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Tue, 1 Aug 2017 16:45:25 +0200 Subject: #928: fix possible TypeError --- psutil/_psbsd.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'psutil/_psbsd.py') diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py index fe55f92f..ba2414cd 100644 --- a/psutil/_psbsd.py +++ b/psutil/_psbsd.py @@ -719,8 +719,10 @@ class Process(object): except KeyError: status = TCP_STATUSES[cext.PSUTIL_CONN_NONE] if fam in (AF_INET, AF_INET6): - laddr = _common.addr(*laddr) - raddr = _common.addr(*raddr) + if laddr: + laddr = _common.addr(*laddr) + if raddr: + raddr = _common.addr(*raddr) fam = sockfam_to_enum(fam) type = socktype_to_enum(type) nt = _common.pconn(fd, fam, type, laddr, raddr, status) @@ -737,8 +739,10 @@ class Process(object): for item in rawlist: fd, fam, type, laddr, raddr, status = item if fam in (AF_INET, AF_INET6): - laddr = _common.addr(*laddr) - raddr = _common.addr(*raddr) + if laddr: + laddr = _common.addr(*laddr) + if raddr: + raddr = _common.addr(*raddr) fam = sockfam_to_enum(fam) type = socktype_to_enum(type) status = TCP_STATUSES[status] -- cgit v1.2.1 From 56e82a63a5fa4b7ab77d13b08179f3d035523849 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Fri, 8 Sep 2017 20:49:41 +0800 Subject: fix #1125: [BSD] net_connections() raises TypeError. --- psutil/_psbsd.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'psutil/_psbsd.py') diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py index ba2414cd..6517f244 100644 --- a/psutil/_psbsd.py +++ b/psutil/_psbsd.py @@ -394,9 +394,12 @@ def net_connections(kind): # have a very short lifetime so maybe the kernel # can't initialize their status? status = TCP_STATUSES[cext.PSUTIL_CONN_NONE] + if fam in (AF_INET, AF_INET6): + if laddr: + laddr = _common.addr(*laddr) + if raddr: + raddr = _common.addr(*raddr) fam = sockfam_to_enum(fam) - laddr = _common.addr(*laddr) - raddr = _common.addr(*raddr) type = socktype_to_enum(type) nt = _common.sconn(fd, fam, type, laddr, raddr, status, pid) ret.add(nt) -- cgit v1.2.1 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/_psbsd.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'psutil/_psbsd.py') diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py index 6517f244..a9d16450 100644 --- a/psutil/_psbsd.py +++ b/psutil/_psbsd.py @@ -27,6 +27,10 @@ from ._common import sockfam_to_enum from ._common import socktype_to_enum from ._common import usage_percent from ._compat import which +from ._exceptions import NoSuchProcess +from ._exceptions import ZombieProcess +from ._exceptions import AccessDenied +from ._exceptions import TimeoutExpired __extra__all__ = [] @@ -128,12 +132,6 @@ kinfo_proc_map = dict( name=24, ) -# 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/_psbsd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'psutil/_psbsd.py') diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py index a9d16450..c26300a3 100644 --- a/psutil/_psbsd.py +++ b/psutil/_psbsd.py @@ -27,10 +27,10 @@ from ._common import sockfam_to_enum from ._common import socktype_to_enum from ._common import usage_percent from ._compat import which -from ._exceptions import NoSuchProcess -from ._exceptions import ZombieProcess from ._exceptions import AccessDenied +from ._exceptions import NoSuchProcess from ._exceptions import TimeoutExpired +from ._exceptions import ZombieProcess __extra__all__ = [] -- 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/_psbsd.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'psutil/_psbsd.py') diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py index c26300a3..0553401a 100644 --- a/psutil/_psbsd.py +++ b/psutil/_psbsd.py @@ -29,7 +29,6 @@ from ._common import usage_percent from ._compat import which from ._exceptions import AccessDenied from ._exceptions import NoSuchProcess -from ._exceptions import TimeoutExpired from ._exceptions import ZombieProcess __extra__all__ = [] @@ -758,10 +757,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): -- cgit v1.2.1