From 8b777eb1d464f7d77b42c7c6c15781f13a8eb84c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 27 Jun 2015 00:18:32 +0530
Subject: [PATCH] Workaround for psutil API change

---
 src/calibre/utils/mem.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/calibre/utils/mem.py b/src/calibre/utils/mem.py
index d2bed39fa7..2b7ebc7367 100644
--- a/src/calibre/utils/mem.py
+++ b/src/calibre/utils/mem.py
@@ -21,7 +21,10 @@ def get_memory():
     'Return memory usage in bytes'
     import psutil
     p = psutil.Process(os.getpid())
-    mem = p.get_ext_memory_info()
+    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)