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

Workaround for psutil API change

Browse Source
This commit is contained in:
Kovid Goyal 2015-06-27 00:18:32 +05:30
parent 8169af0cdc
commit 8b777eb1d4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,9 @@ def get_memory():
'Return memory usage in bytes' 'Return memory usage in bytes'
import psutil import psutil
p = psutil.Process(os.getpid()) p = psutil.Process(os.getpid())
if hasattr(p, 'memory_info_ex'):
mem = p.memory_info_ex()
else:
mem = p.get_ext_memory_info() mem = p.get_ext_memory_info()
attr = 'wset' if iswindows else 'data' if islinux else 'rss' attr = 'wset' if iswindows else 'data' if islinux else 'rss'
return getattr(mem, attr) return getattr(mem, attr)