Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not use deprecated psutil API

Browse Source
This commit is contained in:
Kovid Goyal 2016-09-15 11:48:59 +05:30
parent fa85e21967
commit 8b16eeac34
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/utils/mem.py
View File

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