diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-12-28 23:03:07 +0100 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2019-12-28 23:03:07 +0100 |
commit | 03b29d040881f55eb098e78e71c96164edfb73ec (patch) | |
tree | fc6903c7f82528e90196bb389675bf207f58c3df | |
parent | 283faf2eef04b0ed6dd05f53c84c37bee017ea91 (diff) | |
download | psutil-03b29d040881f55eb098e78e71c96164edfb73ec.tar.gz |
lint
-rw-r--r-- | psutil/__init__.py | 2 | ||||
-rw-r--r-- | psutil/_pslinux.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/psutil/__init__.py b/psutil/__init__.py index b267239e..042af7ef 100644 --- a/psutil/__init__.py +++ b/psutil/__init__.py @@ -1369,6 +1369,8 @@ class Process(object): def wait(self, timeout=None): """Wait for process to terminate and, if process is a children of os.getpid(), also return its exit code, else None. + On Windows there's no such limitation (exit code is always + returned). If the process is already terminated immediately return None instead of raising NoSuchProcess. diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py index e95581cc..694e307b 100644 --- a/psutil/_pslinux.py +++ b/psutil/_pslinux.py @@ -1206,7 +1206,8 @@ def sensors_temperatures(): # https://github.com/giampaolo/psutil/issues/971 # https://github.com/nicolargo/glances/issues/1060 basenames.extend(glob.glob('/sys/class/hwmon/hwmon*/device/temp*_*')) - basenames.extend(glob.glob('/sys/devices/platform/coretemp.*/hwmon/hwmon*/temp*_*')) + basenames.extend(glob.glob( + '/sys/devices/platform/coretemp.*/hwmon/hwmon*/temp*_*')) basenames = sorted(set([x.split('_')[0] for x in basenames])) for base in basenames: |