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

Merge pull request #867 from ZyX-I/fix-shutdown 

Fix shutdown function being always None
This commit is contained in:
ZyX-I 2014-05-03 13:06:21 +04:00
parent fa502281f3 d759a0a806
commit 7e637d257b
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
powerline/segment.py
View File

@ -45,6 +45,18 @@ segment_getters = {
}
def get_attr_func(contents_func, key, args):
try:
func = getattr(contents_func, key)
except AttributeError:
return None
else:
if args is None:
return lambda : func()
else:
return lambda pl, shutdown_event: func(pl=pl, shutdown_event=shutdown_event, **args)
def gen_segment_getter(pl, ext, path, theme_configs, default_module=None):
data = {
'default_module': default_module or 'powerline.segments.' + ext,
@ -75,12 +87,8 @@ def gen_segment_getter(pl, ext, path, theme_configs, default_module=None):
if segment_type == 'function':
args = dict(((str(k), v) for k, v in get_key(segment, module, 'args', {}).items()))
try:
_startup_func = _contents_func.startup
except AttributeError:
startup_func = None
else:
startup_func = lambda pl, shutdown_event: _startup_func(pl=pl, shutdown_event=shutdown_event, **args)
startup_func = get_attr_func(_contents_func, 'startup', args)
shutdown_func = get_attr_func(_contents_func, 'shutdown', None)
if hasattr(_contents_func, 'powerline_requires_segment_info'):
contents_func = lambda pl, segment_info: _contents_func(pl=pl, segment_info=segment_info, **args)
@ -88,6 +96,7 @@ def gen_segment_getter(pl, ext, path, theme_configs, default_module=None):
contents_func = lambda pl, segment_info: _contents_func(pl=pl, **args)
else:
startup_func = None
shutdown_func = None
contents_func = None
return {
@ -109,8 +118,8 @@ def gen_segment_getter(pl, ext, path, theme_configs, default_module=None):
'include_modes': segment.get('include_modes', []),
'width': segment.get('width'),
'align': segment.get('align', 'l'),
'shutdown': getattr(contents_func, 'shutdown', None),
'startup': startup_func,
'shutdown': shutdown_func,
'_rendered_raw': '',
'_rendered_hl': '',
'_len': 0,