Osx temps

psutil/__init__.py

@@ -2175,7 +2175,7 @@ def net_if_stats():
 # =====================================================================
 
 
-# Linux
+# Linux, OSX
 if hasattr(_psplatform, "sensors_temperatures"):
 
     def sensors_temperatures(fahrenheit=False):
@@ -2213,7 +2213,7 @@ def convert(n):
     __all__.append("sensors_temperatures")
 
 
-# Linux
+# Linux, OSX
 if hasattr(_psplatform, "sensors_fans"):
 
     def sensors_fans():

psutil/_common.py

@@ -196,7 +196,7 @@ class BatteryTime(enum.IntEnum):
     'shwtemp', ['label', 'current', 'high', 'critical'])
 # psutil.sensors_battery()
 sbattery = namedtuple('sbattery', ['percent', 'secsleft', 'power_plugged'])
-# psutil.sensors_battery()
+# psutil.sensors_fans()
 sfan = namedtuple('sfan', ['label', 'current'])
 
 # --- for Process methods

psutil/_psosx.py

@@ -6,6 +6,7 @@
 
 import contextlib
 import errno
+import collections
 import functools
 import os
 from socket import AF_INET
@@ -212,6 +213,42 @@ def disk_partitions(all=False):
 # =====================================================================
 
 
+def sensors_temperatures():
+    """Return CPU temperatures
+    including key name and temperature.
+    """
+    ret = collections.defaultdict(list)
+
+    # This handles returning per-core temperature. The SMCkeys for core
+    # temperatue are known
+    rawlist = cext.cpu_cores_temperatures()
+    for core in rawlist:
+        ret["CPU"].append((core[0], core[1], None, None))
+
+    # Additional CPU sensors
+    rawlist = cext.cpu_misc_temperatures()
+    for core in rawlist:
+        ret["CPU"].append((core[0], core[1], None, None))
+
+    try:
+        rawlist = cext.battery_temperatures()
+        if rawlist is not None:
+            for batt in rawlist:
+                ret["Batteries"].append((batt[0], batt[1], None, None))
+    except(SystemError):
+        pass
+
+    try:
+        rawlist = cext.hdd_temperatures()
+        if rawlist is not None:
+            for temp in rawlist:
+                ret["HDD"].append((temp[0], temp[1], None, None))
+    except(SystemError):
+        pass
+
+    return dict(ret)
+
+
 def sensors_battery():
     """Return battery information.
     """
@@ -230,6 +267,19 @@ def sensors_battery():
     return _common.sbattery(percent, secsleft, power_plugged)
 
 
+def sensors_fans():
+    """Return fans speed information.
+    """
+    ret = collections.defaultdict(list)
+    try:
+        for key, value in cext.sensors_fans().items():
+            ret["Fans"].append(_common.sfan(key, int(value)))
+    except (SystemError):
+        # Returns an empty dict if no fans were detected
+        pass
+    return dict(ret)
+
+
 # =====================================================================
 # --- network
 # =====================================================================