blender
/
blender-addons
17
33
Fork 92
Code Issues 526 Pull Requests 32 Projects 1 Releases Wiki Activity

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

Differential Revision: https://developer.blender.org/D4759
This commit is contained in:
Predrag Ivanović 2019-04-30 14:05:44 +02:00 committed by Jacques Lucke
parent 7274975940
commit 89568c1a42
Notes: blender-bot 2023-02-14 19:16:34 +01:00 
Referenced by issue #63982, A.N.T Landscape add-on broken after psutil API change
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ant_landscape/stats.py
View File

@ -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