Remove Py3sensors and replace it by PsUtil

NEWS

@@ -5,6 +5,10 @@ Glances Version 2
 Version 2.8.1
 =============
 
+Changes:
+    * Use new sensors-related APIs of Psutil 5.1.0 (issue #1018)
+
+
 Bugs corrected:
 
     * Autodiscover error while binding on IPv6 addresses (issue #1002)

README.rst

@@ -64,7 +64,6 @@ Optional dependencies:
 - ``nvidia-ml-py`` (for the GPU plugin)
 - ``pika`` (for the RabbitMQ/ActiveMQ export module)
 - ``potsdb`` (for the OpenTSDB export module)
-- ``py3sensors`` (for hardware monitoring support) [Linux-only]
 - ``py-cpuinfo`` (for the Quicklook CPU info module)
 - ``pymdstat`` (for RAID support) [Linux-only]
 - ``pysnmp`` (for SNMP support)
@@ -132,12 +131,11 @@ just install psutil from the binary installation file.
 to install the *wireless-tools* package on your system.
 
 You can also install the following libraries in order to use optional
-features (like the Web interface, exports modules, sensors...):
+features (like the Web interface, exports modules...):
 
 .. code-block:: console
 
     pip install glances[action,batinfo,browser,cpuinfo,chart,docker,export,folders,gpu,ip,raid,snmp,web,wifi]
-    pip install https://bitbucket.org/gleb_zhulik/py3sensors/get/tip.zip
 
 To upgrade Glances to the latest version:
 

glances/plugins/glances_sensors.py

@@ -19,14 +19,10 @@
 
 """Sensors plugin."""
 
-# Sensors library (optional; Linux-only)
+from psutil import sensors_temperatures
-# Py3Sensors: https://bitbucket.org/gleb_zhulik/py3sensors
-try:
-    import sensors
-except ImportError:
-    pass
 
 from glances.logger import logger
+from glances.compat import iteritems
 from glances.plugins.glances_batpercent import Plugin as BatPercentPlugin
 from glances.plugins.glances_hddtemp import Plugin as HddTempPlugin
 from glances.plugins.glances_plugin import GlancesPlugin
@@ -228,7 +224,7 @@ class GlancesGrabSensors(object):
     def __init__(self):
         """Init sensors stats."""
         try:
-            sensors.init()
+            sensors_temperatures()
         except Exception:
             self.initok = False
         else:
@@ -246,24 +242,25 @@ class GlancesGrabSensors(object):
         # Reset the list
         self.reset()
 
-        if self.initok:
+        if not self.initok:
-            for chip in sensors.iter_detected_chips():
+            return self.sensors_list
+
+        # Temperature sensor
+        for chipname, chip in iteritems(sensors_temperatures()):
+            i = 1
             for feature in chip:
                 sensors_current = {}
-                    if feature.name.startswith(b'temp'):
+                # Sensor name
-                        # Temperature sensor
+                if feature.label == '':
-                        sensors_current['unit'] = SENSOR_TEMP_UNIT
+                    sensors_current['label'] = chipname + ' ' + str(i)
-                    elif feature.name.startswith(b'fan'):
-                        # Fan speed sensor
-                        sensors_current['unit'] = SENSOR_FAN_UNIT
-                    if sensors_current:
-                        try:
-                            sensors_current['label'] = feature.label
-                            sensors_current['value'] = int(feature.get_value())
-                        except Exception as e:
-                            logger.debug("Cannot grab sensor stat (%s)" % e)
                 else:
+                    sensors_current['label'] = feature.label
+                # Temperature and unit
+                sensors_current['value'] = int(feature.current)
+                sensors_current['unit'] = SENSOR_TEMP_UNIT
+                # Add sensor to the list
                 self.sensors_list.append(sensors_current)
+                i += 1
 
         return self.sensors_list