From 89568c1a42eb894d4c4b51dbc0a896f20a64bcfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Predrag=20Ivanovi=C4=87?= Date: Tue, 30 Apr 2019 14:05:44 +0200 Subject: Fix T63982: A.N.T. Landscape add-on broken after psutil API change Differential Revision: https://developer.blender.org/D4759 --- ant_landscape/stats.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'ant_landscape') 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 -- cgit v1.2.3