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

Rename create_renderer_kwargs to cr_kwargs for consistency

This commit is contained in:
ZyX 2014-07-10 20:45:28 +04:00
parent c891d75c2b
commit 0fc7856b1b
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
powerline/__init__.py
View File

@ -207,14 +207,14 @@ class Powerline(object):
self.find_config_file = generate_config_finder(self.get_config_paths) self.find_config_file = generate_config_finder(self.get_config_paths)
self.cr_kwargs_lock = Lock() self.cr_kwargs_lock = Lock()
self.create_renderer_kwargs = {} self.cr_kwargs = {}
self.cr_callbacks = {} self.cr_callbacks = {}
for key in ('main', 'colors', 'colorscheme', 'theme'): for key in ('main', 'colors', 'colorscheme', 'theme'):
self.create_renderer_kwargs['load_' + key] = True self.cr_kwargs['load_' + key] = True
self.cr_callbacks[key] = _generate_change_callback( self.cr_callbacks[key] = _generate_change_callback(
self.cr_kwargs_lock, self.cr_kwargs_lock,
'load_' + key, 'load_' + key,
self.create_renderer_kwargs self.cr_kwargs
) )
self.shutdown_event = shutdown_event or Event() self.shutdown_event = shutdown_event or Event()
@ -460,23 +460,23 @@ class Powerline(object):
'''Updates/creates a renderer if needed.''' '''Updates/creates a renderer if needed.'''
if self.run_loader_update: if self.run_loader_update:
self.config_loader.update() self.config_loader.update()
create_renderer_kwargs = None cr_kwargs = None
with self.cr_kwargs_lock: with self.cr_kwargs_lock:
if self.create_renderer_kwargs: if self.cr_kwargs:
create_renderer_kwargs = self.create_renderer_kwargs.copy() cr_kwargs = self.cr_kwargs.copy()
if create_renderer_kwargs: if cr_kwargs:
try: try:
self.create_renderer(**create_renderer_kwargs) self.create_renderer(**cr_kwargs)
except Exception as e: except Exception as e:
self.exception('Failed to create renderer: {0}', str(e)) self.exception('Failed to create renderer: {0}', str(e))
if hasattr(self, 'renderer'): if hasattr(self, 'renderer'):
with self.cr_kwargs_lock: with self.cr_kwargs_lock:
self.create_renderer_kwargs.clear() self.cr_kwargs.clear()
else: else:
raise raise
else: else:
with self.cr_kwargs_lock: with self.cr_kwargs_lock:
self.create_renderer_kwargs.clear() self.cr_kwargs.clear()
def render(self, *args, **kwargs): def render(self, *args, **kwargs):
'''Update/create renderer if needed and pass all arguments further to '''Update/create renderer if needed and pass all arguments further to

2
tests/lib/config_mock.py
View File

@ -114,7 +114,7 @@ class TestPowerline(Powerline):
return local_themes return local_themes
def _will_create_renderer(self): def _will_create_renderer(self):
return self.create_renderer_kwargs return self.cr_kwargs
renderer = SimpleRenderer renderer = SimpleRenderer