tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-13 17:04:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #838 from ZyX-I/new-psutil-fixes

Browse Source 
New psutil fixes
This commit is contained in:
ZyX-I 2014-03-13 19:32:39 +03:00
commit 534b0434f3
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
powerline/segments/common.py
View File

@ -517,6 +517,12 @@ try:
if data: if data:
yield interface, data.bytes_recv, data.bytes_sent yield interface, data.bytes_recv, data.bytes_sent
# psutil-2.0.0: psutil.Process.username is unbound method
if callable(psutil.Process.username):
def _get_user(segment_info):
return psutil.Process(os.getpid()).username()
# pre psutil-2.0.0: psutil.Process.username has type property
else:
def _get_user(segment_info): def _get_user(segment_info):
return psutil.Process(os.getpid()).username return psutil.Process(os.getpid()).username

13
tests/test_segments.py
View File

@ -169,7 +169,18 @@ class TestCommon(TestCase):
def test_user(self): def test_user(self):
new_os = new_module('os', getpid=lambda: 1) new_os = new_module('os', getpid=lambda: 1)
new_psutil = new_module('psutil', Process=lambda pid: Args(username='def'))
class Process(object):
def __init__(self, pid):
pass
def username(self):
return 'def'
if hasattr(common, 'psutil') and not callable(common.psutil.Process.username):
username = property(username)
new_psutil = new_module('psutil', Process=Process)
pl = Pl() pl = Pl()
with replace_env('USER', 'def') as segment_info: with replace_env('USER', 'def') as segment_info:
common.username = False common.username = False