[Bf-extensions-cvs] [89568c1a] master: Fix T63982: A.N.T. Landscape add-on broken after psutil API change

Predrag Ivanović noreply at git.blender.org
Tue Apr 30 14:08:33 CEST 2019


Commit: 89568c1a42eb894d4c4b51dbc0a896f20a64bcfe
Author: Predrag Ivanović
Date:   Tue Apr 30 14:05:44 2019 +0200
Branches: master
https://developer.blender.org/rBA89568c1a42eb894d4c4b51dbc0a896f20a64bcfe

Fix T63982: A.N.T. Landscape add-on broken after psutil API change

Differential Revision: https://developer.blender.org/D4759

===================================================================

M	ant_landscape/stats.py

===================================================================

diff --git a/ant_landscape/stats.py b/ant_landscape/stats.py
index 77759804..1d6d485c 100644
--- a/ant_landscape/stats.py
+++ b/ant_landscape/stats.py
@@ -25,14 +25,22 @@ class Stats:
     def _gettime(self):
         """return the time in seconds used by the current process."""
         if psutil_available:
-            m=self.process.get_cpu_times()
+            """ Handle psutil API change. """
+            if hasattr(self.process, "get_cpu_times"):
+                m = self.process.get_cpu_times()
+            else:
+                m = self.process.cpu_times()
             return m.user + m.system
         return time()
 
     def _getmem(self):
         """return the resident set size in bytes used by the current process."""
         if psutil_available:
-            m = self.process.get_memory_info()
+            """ Handle psutil API change. """
+            if hasattr(self.process, "get_memory_info"):
+                m = self.process.get_memory_info()
+            else:
+                m = self.process.memory_info()
             return m.rss
         return 0



More information about the Bf-extensions-cvs mailing list