From 8b16eeac342cbe6dddd1f3b17a542ac43f0b39fe Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 15 Sep 2016 11:48:59 +0530 Subject: [PATCH] Do not use deprecated psutil API --- src/calibre/utils/mem.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/calibre/utils/mem.py b/src/calibre/utils/mem.py index 2b7ebc7367..25e21b5785 100644 --- a/src/calibre/utils/mem.py +++ b/src/calibre/utils/mem.py @@ -15,18 +15,11 @@ value. import gc, os -from calibre.constants import iswindows, islinux - def get_memory(): 'Return memory usage in bytes' + # See https://pythonhosted.org/psutil/#psutil.Process.memory_info import psutil - p = psutil.Process(os.getpid()) - if hasattr(p, 'memory_info_ex'): - mem = p.memory_info_ex() - else: - mem = p.get_ext_memory_info() - attr = 'wset' if iswindows else 'data' if islinux else 'rss' - return getattr(mem, attr) + return psutil.Process(os.getpid()).memory_info().rss def memory(since=0.0): 'Return memory used in MB. The value of since is subtracted from the used memory'