summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CREDITS4
-rw-r--r--HISTORY.rst5
-rwxr-xr-xpsutil/tests/test_linux.py1
3 files changed, 10 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 49f255cc..988af1fe 100644
--- a/CREDITS
+++ b/CREDITS
@@ -652,3 +652,7 @@ N: Po-Chuan Hsieh
W: https://github.com/sunpoet
C: Taiwan
I: 1646
+
+N: Javad Karabi
+W: https://github.com/karabijavad
+I: 1648
diff --git a/HISTORY.rst b/HISTORY.rst
index 5a56542d..16d18c08 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -5,6 +5,11 @@
XXXX-XX-XX
+**Enhancements**
+
+- 1648_: [Linux] sensors_temperatures() looks into an additional /sys/device/
+ directory for additional data. (patch by Javad Karabi)
+
**Bug fixes**
- 1637_: [SunOS] Add partial support for old SunOS 5.10 Update 0 to 3.
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
index 4d9cea92..f503b384 100755
--- a/psutil/tests/test_linux.py
+++ b/psutil/tests/test_linux.py
@@ -1616,6 +1616,7 @@ class TestSensorsTemperatures(unittest.TestCase):
elif path == '/sys/class/thermal/thermal_zone0/trip_point*':
return ['/sys/class/thermal/thermal_zone1/trip_point_0_type',
'/sys/class/thermal/thermal_zone1/trip_point_0_temp']
+ return []
orig_open = open
patch_point = 'builtins.open' if PY3 else '__builtin__.open'