diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2015-02-09 14:42:26 +0100 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2015-02-09 14:42:26 +0100 |
commit | 76cd3a6e5cbd86aea6cc36b59245ba530c4317ac (patch) | |
tree | 411dc6f32ce337387623e0838427c014f03ee9d3 /psutil/_pssunos.py | |
parent | 0cac87adf0e41187907e5d1b421b2581af085269 (diff) | |
parent | ea8853644e34ef3036912df77e8f1615e9251e87 (diff) | |
download | psutil-76cd3a6e5cbd86aea6cc36b59245ba530c4317ac.tar.gz |
merge from master
Diffstat (limited to 'psutil/_pssunos.py')
-rw-r--r-- | psutil/_pssunos.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/psutil/_pssunos.py b/psutil/_pssunos.py index 031231b8..69281a8c 100644 --- a/psutil/_pssunos.py +++ b/psutil/_pssunos.py @@ -13,13 +13,13 @@ import subprocess import sys from collections import namedtuple -from psutil import _common -from psutil import _psposix -from psutil._common import isfile_strict, socktype_to_enum, sockfam_to_enum -from psutil._common import usage_percent -from psutil._compat import PY3 -import _psutil_posix -import _psutil_sunos as cext +from . import _common +from . import _psposix +from . import _psutil_posix as cext_posix +from . import _psutil_sunos as cext +from ._common import isfile_strict, socktype_to_enum, sockfam_to_enum +from ._common import usage_percent +from ._compat import PY3 __extra__all__ = ["CONN_IDLE", "CONN_BOUND"] @@ -74,7 +74,7 @@ TimeoutExpired = None disk_io_counters = cext.disk_io_counters net_io_counters = cext.net_io_counters disk_usage = _psposix.disk_usage -net_if_addrs = _psutil_posix.net_if_addrs +net_if_addrs = cext_posix.net_if_addrs def virtual_memory(): @@ -297,7 +297,7 @@ class Process(object): # Note: tested on Solaris 11; on Open Solaris 5 everything is # fine. try: - return _psutil_posix.getpriority(self.pid) + return cext_posix.getpriority(self.pid) except EnvironmentError as err: if err.errno in (errno.ENOENT, errno.ESRCH): if pid_exists(self.pid): @@ -312,7 +312,7 @@ class Process(object): # The process actually exists though, as it has a name, # creation time, etc. raise AccessDenied(self.pid, self._name) - return _psutil_posix.setpriority(self.pid, value) + return cext_posix.setpriority(self.pid, value) @wrap_exceptions def ppid(self): |