tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update powerline for new psutil 

Fixes #835
This commit is contained in:
ZyX 2014-03-13 19:38:05 +04:00
parent 70a94ee7d3
commit ecf26dfbc6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
powerline/segments/common.py
View File

@ -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