From ecf26dfbc65e0c39001e8283e776c50899f90e1b Mon Sep 17 00:00:00 2001 From: ZyX Date: Thu, 13 Mar 2014 19:38:05 +0400 Subject: [PATCH] Update powerline for new psutil Fixes #835 --- powerline/segments/common.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/powerline/segments/common.py b/powerline/segments/common.py index 01c18a20..06f3d563 100644 --- a/powerline/segments/common.py +++ b/powerline/segments/common.py @@ -517,8 +517,14 @@ try: if data: yield interface, data.bytes_recv, data.bytes_sent - def _get_user(segment_info): - return psutil.Process(os.getpid()).username + # Pre psutil-2.0.0: psutil.Process.username has type property + if callable(psutil.Process.username): + def _get_user(segment_info): + return psutil.Process(os.getpid()).username() + # psutil-2.0.0: psutil.Process.username is unbound method + else: + def _get_user(segment_info): + return psutil.Process(os.getpid()).username class CPULoadPercentSegment(ThreadedSegment): interval = 1