From d28cc6369c831a5472d38b5d1cb167df6c8d0653 Mon Sep 17 00:00:00 2001 From: hcpl Date: Fri, 28 Oct 2016 18:42:40 +0300 Subject: [PATCH 1/2] Mem: fix displaying negative values (#485) Accomodating to changes made in `psutil` version 4.4.0 in calculating `virtual_memory().used`. --- i3pystatus/mem.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/i3pystatus/mem.py b/i3pystatus/mem.py index c327ceb..a1a77d2 100644 --- a/i3pystatus/mem.py +++ b/i3pystatus/mem.py @@ -1,5 +1,5 @@ from i3pystatus import IntervalModule -from psutil import virtual_memory +import psutil from .core.util import round_dict @@ -42,12 +42,15 @@ class Mem(IntervalModule): ) def run(self): - memory_usage = virtual_memory() - used = memory_usage.used - memory_usage.cached - memory_usage.buffers + memory_usage = psutil.virtual_memory() + + if psutil.version_info < (4,4,0): + used = memory_usage.used - memory_usage.cached - memory_usage.buffers + else: + used = memory_usage.used if memory_usage.percent >= self.alert_percentage: color = self.alert_color - elif memory_usage.percent >= self.warn_percentage: color = self.warn_color else: From 8adc73ec53c13bea11050f3069637fd00165b672 Mon Sep 17 00:00:00 2001 From: hcpl Date: Fri, 28 Oct 2016 18:50:19 +0300 Subject: [PATCH 2/2] Mem: conform to PEP 8 --- i3pystatus/mem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i3pystatus/mem.py b/i3pystatus/mem.py index a1a77d2..9e26ea2 100644 --- a/i3pystatus/mem.py +++ b/i3pystatus/mem.py @@ -44,7 +44,7 @@ class Mem(IntervalModule): def run(self): memory_usage = psutil.virtual_memory() - if psutil.version_info < (4,4,0): + if psutil.version_info < (4, 4, 0): used = memory_usage.used - memory_usage.cached - memory_usage.buffers else: used = memory_usage.used