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

Merge commit 'HEAD@{1}' into develop

Browse Source
This commit is contained in:
ZyX 2014-09-06 22:45:45 +04:00
commit 02b9071753
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
powerline/bindings/vim/plugin/powerline.vim
View File

@ -86,7 +86,7 @@ finally
if !exists('s:launched') if !exists('s:launched')
unlet s:pystr unlet s:pystr
echohl ErrorMsg echohl ErrorMsg
echomsg 'An error occurred while importing powerline package.' echomsg 'An error occurred while importing powerline module.'
echomsg 'This could be caused by invalid sys.path setting,' echomsg 'This could be caused by invalid sys.path setting,'
echomsg 'or by an incompatible Python version (powerline requires' echomsg 'or by an incompatible Python version (powerline requires'
echomsg 'Python 2.6, 2.7 or 3.2 and later to work). Please consult' echomsg 'Python 2.6, 2.7 or 3.2 and later to work). Please consult'

8
powerline/segments/common.py
View File

@ -342,7 +342,7 @@ else:
internal_ip = with_docstring(internal_ip, internal_ip = with_docstring(internal_ip,
'''Return internal IP address '''Return internal IP address
Requires ``netifaces`` package to work properly. Requires ``netifaces`` module to work properly.
:param str interface: :param str interface:
Interface on which IP will be checked. Use ``detect`` to automatically Interface on which IP will be checked. Use ``detect`` to automatically
@ -708,7 +708,7 @@ except ImportError:
@staticmethod @staticmethod
def render(cpu_percent, pl, format='{0:.0f}%', **kwargs): def render(cpu_percent, pl, format='{0:.0f}%', **kwargs):
pl.warn('psutil package is not installed, thus CPU load is not available') pl.warn('Module “psutil” is not installed, thus CPU load is not available')
return None return None
@ -792,7 +792,7 @@ def uptime(pl, days_format='{days:d}d', hours_format=' {hours:d}h', minutes_form
try: try:
seconds = _get_uptime() seconds = _get_uptime()
except NotImplementedError: except NotImplementedError:
pl.warn('Unable to get uptime. You should install psutil package') pl.warn('Unable to get uptime. You should install psutil module')
return None return None
minutes, seconds = divmod(seconds, 60) minutes, seconds = divmod(seconds, 60)
hours, minutes = divmod(minutes, 60) hours, minutes = divmod(minutes, 60)
@ -1111,7 +1111,7 @@ class NowPlayingSegment(Segment):
try: try:
import dbus import dbus
except ImportError: except ImportError:
pl.exception('Could not add {0} segment: requires python-dbus', player_name) pl.exception('Could not add {0} segment: requires dbus module', player_name)
return return
bus = dbus.SessionBus() bus = dbus.SessionBus()
try: try: