|
@@ -148,7 +148,7 @@ def mem_rss():
|
|
|
"""Return RSS memory usage as a humanized string."""
|
|
|
p = ps()
|
|
|
if p is not None:
|
|
|
- return humanbytes(p.get_memory_info().rss)
|
|
|
+ return humanbytes(_process_memory_info(p).rss)
|
|
|
|
|
|
|
|
|
def ps(): # pragma: no cover
|
|
@@ -158,3 +158,10 @@ def ps(): # pragma: no cover
|
|
|
if _process is None and Process is not None:
|
|
|
_process = Process(os.getpid())
|
|
|
return _process
|
|
|
+
|
|
|
+
|
|
|
+def _process_memory_info(process):
|
|
|
+ try:
|
|
|
+ return process.memory_info()
|
|
|
+ except AttributeError:
|
|
|
+ return process.get_memory_info()
|